Changeset 9f90ba9a6093963bea2897ebb7cd4d1509a7ff31

Timestamp:

11/22/11 22:21:26 (1 year ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1322000486 -0500

git-parent:

[16ce15221b247e2c154c6c14f52a100bbe6e410e]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1322000486 -0500

Message:

support extended_id for stratcon internal metrics

Files:

• src/stratcon_jlog_streamer.c (modified) (4 diffs)

src/stratcon_jlog_streamer.c

@@ -63 +63 @@
-static char self_stratcon_hostname[256] = "\0";
-static struct sockaddr_in self_stratcon_ip;
+static noit_boolean stratcon_selfcheck_extended_id = true;
-
-static struct timeval DEFAULT_NOIT_PERIOD_TV = { 5UL, 0UL };
@@ -1132 +1133 @@
-  int klen, n = 0, i;
-  char str[1024];
-
+1024], tmp_uuid_str[
-  struct timeval epoch, diff;
-  u_int64_t uptime = 0;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-#define PUSH_BOTH(type, str) do { \
@@ -1149 +1160 @@
-  if(closure == NULL) {
-    /* Only do this the first time we get called */
-    char ip_str[128];
-    inet_ntop(AF_INET, &self_stratcon_ip.sin_addr, ip_str,
-              sizeof(ip_str));
-    snprintf(str, sizeof(str), "C\t%lu.%03lu\t%s\t%s\tstratcon\t%s\n",
-             (long unsigned int)now->tv_sec,
@@ -1627 +1635 @@
-     uuid_parse(uuid_str, self_stratcon_id) == 0) {
-    int period;
+    noit_conf_get_boolean(NULL, "/stratcon/@extended_id",
+                          &stratcon_selfcheck_extended_id);
-    /* If a UUID was provided for stratcon itself, we will report metrics
-     * on a large variety of things (including all noits).