Changeset 6b7bec911ad60ccd8e558dab8fd3147427bdc640

Show
Ignore:
Timestamp:
07/07/11 19:51:48 (3 years ago)
Author:
Theo Schlossnagle <jesus@omniti.com>
git-committer:
Theo Schlossnagle <jesus@omniti.com> 1310068308 -0400
git-parent:

[4a653ea2ad1a5c2d4fa77037753a169291289a11]

git-author:
Theo Schlossnagle <jesus@omniti.com> 1310068308 -0400
Message:

simplify this and fix a bug in UUID construction on new bundles

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • src/noit_check_log.c

    r4a653ea r6b7bec9  
    315315 
    316316static int 
    317 _noit_check_log_bundle_serialize(noit_log_stream_t ls, noit_check_t *check) { 
     317noit_check_log_bundle_serialize(noit_log_stream_t ls, noit_check_t *check) { 
    318318  int rv = 0; 
    319319  char uuid_str[256*3+37]; 
     
    329329  Bundle bundle = BUNDLE__INIT; 
    330330  SETUP_LOG(bundle, ); 
    331   MAKE_CHECK_UUID_STR(uuid_str, sizeof(uuid_str), metrics_log, check); 
     331  MAKE_CHECK_UUID_STR(uuid_str, sizeof(uuid_str), bundle_log, check); 
    332332 
    333333  // Get a bundle 
     
    382382} 
    383383 
    384 static int 
    385 _noit_check_log_bundle(noit_log_stream_t ls, noit_check_t *check) { 
    386   return _noit_check_log_bundle_serialize(bundle_log, check); 
    387 } 
    388  
    389384void 
    390385noit_check_log_bundle(noit_check_t *check) { 
    391   handle_extra_feeds(check, _noit_check_log_bundle); 
     386  handle_extra_feeds(check, noit_check_log_bundle_serialize); 
    392387  if(!(check->flags & (NP_TRANSIENT | NP_SUPPRESS_STATUS | NP_SUPPRESS_METRICS))) { 
    393388    SETUP_LOG(bundle, return); 
    394     _noit_check_log_bundle(bundle_log, check); 
     389    noit_check_log_bundle_serialize(bundle_log, check); 
    395390  } 
    396391}