Changeset 6433ed5710527810a2bffc7a4ac76f22ba764086

Timestamp:

06/30/11 18:45:28 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1309459528 -0400

git-parent:

[924cc36ec9423b671145b00b782f797fdc4f816b], [5079a1f4e83875fdd95077bb5fae8079eb8b4bd9]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1309459528 -0400

Message:

Merge branch 'master' into dtrace

Files:

• src/eventer/eventer_SSL_fd_opset.c (modified) (4 diffs)
• src/modules/postgres_ingestor.c (modified) (2 diffs)
• src/noit.conf.in (modified) (1 diff)
• src/noit_check.c (modified) (1 diff)
• src/noit_check.h (modified) (1 diff)
• src/noit_check_log.c (modified) (3 diffs)
• src/stratcon_datastore.c (modified) (1 diff)

src/eventer/eventer_SSL_fd_opset.c

@@ -51 +51 @@
-  SSL_CTX *internal_ssl_ctx;
-  time_t creation_time;
+  unsigned crl_loaded:1;
-  noit_atomic32_t refcnt;
-} ssl_ctx_cache_node;
@@ -73 +74 @@
-
-#define ssl_ctx ssl_ctx_cn->internal_ssl_ctx
+#define ssl_ctx_crl_loaded ssl_ctx_cn->crl_loaded
-
-/* Static function prototypes */
@@ -402 +404 @@
-  X509_STORE *store;
-  X509_LOOKUP *lookup;
+  if(ctx->ssl_ctx_crl_loaded) return 1;
-  store = SSL_CTX_get_cert_store(ctx->ssl_ctx);
-  lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
@@ -407 +410 @@
-  X509_STORE_set_flags(store, X509_V_FLAG_CRL_CHECK |
-                              X509_V_FLAG_CRL_CHECK_ALL);
+  if(!ret) eventer_ssl_error();
+  else ctx->ssl_ctx_crl_loaded = 1;
-  return ret;
-}

src/modules/postgres_ingestor.c

@@ -693 +693 @@
-        DECLARE_PARAM_STR(final_buff, final_len);
-        free(final_buff);
+        break;
+      case 'D':
-        break;
-      case 'C':
@@ -772 +774 @@
-      PQclear(d->res);
-      break;
+    case 'D':
+      break;
-    case 'M':
-      switch(d->metric_type) {

src/noit.conf.in

@@ -51 +51 @@
-      <outlet name="feed"/>
-      <log name="check"/>
+      <log name="delete"/>
-      <log name="status"/>
-      <log name="metrics"/>

src/noit_check.c

@@ -778 +778 @@
-  checker->flags |= (NP_DISABLED|NP_KILLED);
-
+  noit_check_log_delete(checker);
+
-  noit_skiplist_remove(&polls_by_name, checker, NULL);
-  noit_hash_delete(&polls, (char *)in, UUID_SIZE, NULL, NULL);

src/noit_check.h

@@ -266 +266 @@
-API_EXPORT(void) noit_check_log_check(noit_check_t *check);
-API_EXPORT(void) noit_check_log_status(noit_check_t *check);
+API_EXPORT(void) noit_check_log_delete(noit_check_t *check);
-API_EXPORT(void) noit_check_log_metrics(noit_check_t *check);
-API_EXPORT(void) noit_check_log_metric(noit_check_t *check,

src/noit_check_log.c

@@ -45 +45 @@
- *  'n' TIMESTAMP strlen(xmlconfig) base64(gzip(xmlconfig))
- *
+ * DELETE:
+ *  'D' TIMESTAMP UUID
+ *
- * CHECK:
- *  'C' TIMESTAMP UUID TARGET MODULE NAME
@@ -58 +61 @@
-static noit_log_stream_t status_log = NULL;
-static noit_log_stream_t metrics_log = NULL;
+static noit_log_stream_t delete_log = NULL;
-#define SECPART(a) ((unsigned long)(a)->tv_sec)
-#define MSECPART(a) ((unsigned long)((a)->tv_usec / 1000))
@@ -105 +109 @@
-
-static int
+_noit_check_log_delete(noit_log_stream_t ls,
+                       noit_check_t *check) {
+  stats_t *c;
+  char uuid_str[256*3+37];
+  SETUP_LOG(delete, );
+  MAKE_CHECK_UUID_STR(uuid_str, sizeof(uuid_str), status_log, check);
+
+  c = &check->stats.current;
+  return noit_log(ls, &c->whence, __FILE__, __LINE__,
+                  "D\t%lu.%03lu\t%s\n",
+                  SECPART(&c->whence), MSECPART(&c->whence), uuid_str);
+}
+void
+noit_check_log_delete(noit_check_t *check) {
+  if(!(check->flags & NP_TRANSIENT)) {
+    handle_extra_feeds(check, _noit_check_log_delete);
+    SETUP_LOG(delete, return);
+    _noit_check_log_delete(delete_log, check);
+  }
+}
+
+static int
-_noit_check_log_check(noit_log_stream_t ls,
-                      noit_check_t *check) {

src/stratcon_datastore.c

@@ -222 +222 @@
-    case 'S':
-    case 'M':
+    case 'D':
-      if(line[1] == '\t' && (cp1 = strchr(line+2, '\t')) != NULL &&
-         (cp2 = strchr(cp1+1, '\t')) != NULL &&