Changeset 4fd2f1f5cb3d57993fc34dc8d6e742d38454609f

Timestamp:

06/07/09 19:40:49 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[4f39b4d05385ed2a6a1620e2e3a578b2de6a937a]

git-author:

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

Message:

This appears to work... now we need to make sure it works well. refs #142

Files:

• src/java/Makefile.in (modified) (1 diff)
• src/java/com/omniti/reconnoiter/IEPEngine.java (modified) (2 diffs)
• src/java/com/omniti/reconnoiter/StratconConfig.java (added)
• src/java/lib/commons-dbcp-1.2.2.jar (added)
• src/java/lib/commons-pool-1.4.jar (added)
• src/java/lib/postgresql-8.3-604.jdbc3.jar (added)
• src/java/run-iep.sh.in (modified) (2 diffs)
• src/noit_conf.c (modified) (1 diff)
• src/noit_conf.h (modified) (1 diff)
• src/stratcon_iep.c (modified) (1 diff)

src/java/Makefile.in

@@ -30 +30 @@
-        com/omniti/reconnoiter/event/StratconQueryStop.java \
-        com/omniti/reconnoiter/IEPEngine.java \
+        com/omniti/reconnoiter/StratconConfig.java \
-        com/omniti/reconnoiter/StratconMessage.java
-
-SUPPORT=lib/activemq-all-5.2.0.jar lib/antlr-runtime-3.1.1.jar lib/esper-3.0.0.jar \
-        lib/log4j-1.2.15.jar lib/spring-beans-2.5.5.jar lib/spring-context-2.5.5.jar \
-
+
+
-
-all:    reconnoiter.jar

src/java/com/omniti/reconnoiter/IEPEngine.java

@@ -15 +15 @@
-import com.omniti.reconnoiter.event.NoitEvent;
-import com.omniti.reconnoiter.event.NoitMetricNumeric;
+import com.omniti.reconnoiter.StratconConfig;
-import com.espertech.esper.client.*;
-import com.espertech.esper.client.soda.*;
@@ -23 +24 @@
-  static public void main(String[] args) {
-    BasicConfigurator.configure();
+    if(args.length != 1) {
+      System.err.println("Requires exactly one argument");
+      return;
+    }
+    StratconConfig sconf = new StratconConfig(args[0]);
-
-    Configuration config = new Configuration();
+    config.addDatabaseReference("recondb", sconf.getDBConfig());
-    config.addEventTypeAutoName("com.omniti.reconnoiter.event");
-    EPServiceProvider epService = EPServiceProviderManager.getDefaultProvider(config);

src/java/run-iep.sh.in

@@ -6 +6 @@
-        esper-3.0.0.jar log4j-1.2.15.jar \
-        spring-beans-2.5.5.jar spring-context-2.5.5.jar \
-
+
+
-
-DIRS=". lib @prefix@/java"
@@ -27 +28 @@
-        fi
-done
-
+ $*

src/noit_conf.c

@@ -185 +185 @@
-  return -1;
-}
+
+char *noit_conf_config_filename() {
+  return strdup(master_config_file);
+}
+
-int noit_conf_xml_xpath(xmlDocPtr *mc, xmlXPathContextPtr *xp) {
-  if(mc) *mc = master_config;

src/noit_conf.h

@@ -63 +63 @@
-API_EXPORT(int) noit_conf_load(const char *path);
-API_EXPORT(int) noit_conf_save(const char *path);
+API_EXPORT(char *) noit_conf_config_filename();
-
-API_EXPORT(noit_conf_section_t)

src/stratcon_iep.c

@@ -582 +582 @@
-  }
-  if(info->child == 0) {
-2] = { "run-iep"
+3] = { "run-iep", NULL
-    int stdout_fileno;
+
+    argv[1] = noit_conf_config_filename();
-
-    if(chdir(info->directory) != 0) {