Changeset dcd539d74168658a6f7fae5302239f74553717bb

Timestamp:

07/01/08 20:16:09 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1214943369 +0000

git-parent:

[a19b8157a03891ec782d7a880a640be1c6c98663]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1214943369 +0000

Message:

implements stratcon configuration storage in DB, refs #27

Files:

• src/noit_conf.c (modified) (6 diffs)
• src/noit_conf.h (modified) (1 diff)
• src/noitd.c (modified) (1 diff)
• src/stratcon_datastore.c (modified) (6 diffs)
• src/stratcon_datastore.h (modified) (1 diff)
• src/stratcond.c (modified) (2 diffs)

src/noit_conf.c

@@ -462 +462 @@
-  int len;
-  int allocd;
-
+target, 
-};
-static int
@@ -494 +494 @@
-
-  if(clv->buff == NULL) {
-CONFIG_B64
+clv->target
-    return 0;
-  }
-  clv->raw_len = clv->len;
-  assert(clv->encoded == CONFIG_RAW);
+  if(clv->encoded == clv->target) return 0;
+
-  /* Compress */
-  initial_dlen = dlen = compressBound(clv->len);
@@ -514 +516 @@
-  clv->len = dlen;
-  clv->encoded = CONFIG_COMPRESSED;
+  if(clv->encoded == clv->target) return 0;
+
-  /* Encode */
-  initial_dlen = ((clv->len + 2) / 3) * 4;
@@ -528 +532 @@
-  clv->len = dlen;
-  clv->encoded = CONFIG_B64;
-
+
+
-}
-
@@ -592 +597 @@
-  return 0;
-}
+char *
+noit_conf_xml_in_mem(size_t *len) {
+  struct config_line_vstr *clv;
+  xmlOutputBufferPtr out;
+  xmlCharEncodingHandlerPtr enc;
+  char *rv;
+
+  clv = calloc(1, sizeof(*clv));
+  clv->target = CONFIG_RAW;
+  enc = xmlGetCharEncodingHandler(XML_CHAR_ENCODING_UTF8);
+  out = xmlOutputBufferCreateIO(noit_config_log_write_xml,
+                                noit_config_log_close_xml,
+                                clv, enc);
+  xmlSaveFormatFileTo(out, master_config, "utf8", 1);
+  if(clv->encoded != CONFIG_RAW) {
+    noitL(noit_error, "Error logging configuration\n");
+    if(clv->buff) free(clv->buff);
+    free(clv);
+    return NULL;
+  }
+  rv = clv->buff;
+  *len = clv->len;
+  free(clv);
+  return rv;
+}
+
-int
-noit_conf_write_log() {
@@ -607 +638 @@
-  gettimeofday(&__now, NULL);
-  clv = calloc(1, sizeof(*clv));
+  clv->target = CONFIG_B64;
-  enc = xmlGetCharEncodingHandler(XML_CHAR_ENCODING_UTF8);
-  out = xmlOutputBufferCreateIO(noit_config_log_write_xml,

src/noit_conf.h

@@ -84 +84 @@
-                       noit_console_state_t *state, void *closure);
-
+API_EXPORT(char *)
+  noit_conf_xml_in_mem(size_t *len);
+
-API_EXPORT(int)
-  noit_conf_write_log();

src/noitd.c

@@ -111 +111 @@
-
-  /* Write our log out, and setup a watchdog to write it out on change. */
-
+NULL
-  noit_conf_coalesce_changes(10); /* 10 seconds of no changes before we write */
-  noit_conf_watch_and_journal_watchdog(noit_conf_write_log, NULL);

src/stratcon_datastore.c

@@ -36 +36 @@
-
-#define MAX_PARAMS 8
+#define POSTGRES_PARTS \
+  int nparams; \
+  int metric_type; \
+  char *paramValues[MAX_PARAMS]; \
+  int paramLengths[MAX_PARAMS]; \
+  int paramFormats[MAX_PARAMS]; \
+  int paramAllocd[MAX_PARAMS];
+
+typedef struct ds_single_detail {
+  POSTGRES_PARTS
+} ds_single_detail;
-typedef struct ds_job_detail {
+  /* Postgres specific stuff */
+  POSTGRES_PARTS
+
-  char *data;  /* The raw string, NULL means the stream is done -- commit. */
-  int problematic;
-  eventer_t completion_event; /* This event should be registered if non NULL */
-  struct ds_job_detail *next;
-
-  /* Postgres specific stuff */
-  int nparams;
-  int metric_type;
-  char *paramValues[MAX_PARAMS];
-  int paramLengths[MAX_PARAMS];
-  int paramFormats[MAX_PARAMS];
-  int paramAllocd[MAX_PARAMS];
-} ds_job_detail;
-
@@ -61 +67 @@
-
-static void
-job
+single
-  int i;
-  for(i=0; i<d->nparams; i++)
@@ -83 +89 @@
-    next = q->head;
-    q->head = q->head->next;
-
+(ds_single_detail *)
-    if(next->data) free(next->data);
-    free(next);
@@ -215 +221 @@
-        if(len <= 0) {
-          noitL(noit_error, "noitd config base64 decoding error.\n");
+          free(final_buff);
-          goto bad_row;
-        }
@@ -221 +228 @@
-                              (unsigned char *)token, len)) {
-          noitL(noit_error, "noitd config decompression failure.\n");
+          free(final_buff);
-          goto bad_row;
-        }
-        if(final_len != actual_final_len) {
-          noitL(noit_error, "noitd config decompression error.\n");
+          free(final_buff);
-          goto bad_row;
-        }
@@ -485 +494 @@
-  }
-}
+
+int
+stratcon_datastore_saveconfig(void *unused) {
+  int rv = -1;
+  conn_q _cq = { 0 }, *cq = &_cq;
+  char *buff;
+  ds_single_detail _d = { 0 }, *d = &_d;
+
+  if(stratcon_database_connect(cq) == 0) {
+    char time_as_str[20];
+    size_t len;
+    buff = noit_conf_xml_in_mem(&len);
+    if(!buff) goto bad_row;
+
+    snprintf(time_as_str, sizeof(time_as_str), "%lu", time(NULL));
+    DECLARE_PARAM_STR("0.0.0.0", 7);
+    DECLARE_PARAM_STR("stratcond", 9);
+    DECLARE_PARAM_STR(time_as_str, strlen(time_as_str));
+    DECLARE_PARAM_STR(buff, len);
+    free(buff);
+
+    GET_QUERY(config_insert);
+    PG_EXEC(config_insert);
+    rv = 0;
+
+    bad_row:
+      free_params(d);
+  }
+  if(cq->dbh) PQfinish(cq->dbh);
+  return rv;
+}

src/stratcon_datastore.h

@@ -23 +23 @@
-                          struct sockaddr *, void *);
-
+API_EXPORT(int)
+  stratcon_datastore_saveconfig(void *unused);
+
-#endif

src/stratcond.c

@@ -16 +16 @@
-#include "noit_conf.h"
-#include "stratcon_jlog_streamer.h"
+#include "stratcon_datastore.h"
-
-#define APPNAME "stratcon"
@@ -101 +102 @@
-  stratcon_jlog_streamer_init(APPNAME);
-
+  /* Write our log out, and setup a watchdog to write it out on change. */
+  stratcon_datastore_saveconfig(NULL);
+  noit_conf_coalesce_changes(10); /* 10 seconds of no changes before we write */
+  noit_conf_watch_and_journal_watchdog(stratcon_datastore_saveconfig, NULL);
+
-  eventer_loop();
-  return 0;