m

4 files changed, 60 insertions, 65 deletions

diff --git a/datomic-pro-1.0.7469/bin/logback.xml b/datomic-pro-1.0.7469/bin/logback.xml
deleted file mode 100644
index 009e1c3..0000000
--- a/datomic-pro-1.0.7469/bin/logback.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<configuration>
-
-  <!-- prevent per-message overhead for jul logging calls, e.g. Hornet -->
-  <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
-    <resetJUL>true</resetJUL>
-  </contextListener>
-
-  <appender name="MAIN" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${DATOMIC_LOG_DIR:-log}/%d{yyyy-MM-dd}.log</fileNamePattern>
-      <maxHistory>72</maxHistory> 
-    </rollingPolicy>
-    <prudent>true</prudent> <!-- multi jvm safe, slower -->
-    <encoder>
-      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %-10contextName %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <logger name="datomic.cast2slf4j" level="DEBUG"/>
-
-  <!-- uncomment to log storage access -->
-  <!-- <logger name="datomic.kv-cluster" level="DEBUG"/> -->
-
-  <!-- uncomment to log transactor heartbeat -->
-  <!-- <logger name="datomic.lifecycle" level="DEBUG"/> -->
-
-  <!-- uncomment to log transactions (transactor side) -->
-  <!-- <logger name="datomic.transaction" level="DEBUG"/> -->
-
-  <!-- uncomment to log transactions (peer side) -->
-  <!-- <logger name="datomic.peer" level="DEBUG"/> -->
-
-  <!-- uncomment to log the transactor log -->
-  <!-- <logger name="datomic.log" level="DEBUG"/> -->
-
-  <!-- uncomment to log peer connection to transactor -->
-  <!-- <logger name="datomic.connector" level="DEBUG"/> -->
-
-  <!-- uncomment to log storage gc -->
-  <!-- <logger name="datomic.garbage" level="DEBUG"/> -->
-
-  <!-- uncomment to log indexing jobs -->
-  <!-- <logger name="datomic.index" level="DEBUG"/> -->
-
-  <!-- these namespsaces create a ton of log noise -->
-  <logger name="org.apache.activemq.audit" level="WARN"/>
-  <logger name="httpclient" level="INFO"/>
-  <logger name="org.apache.commons.httpclient" level="INFO"/>
-  <logger name="org.apache.http" level="INFO"/>
-  <logger name="org.jets3t" level="INFO"/>
-  <logger name="com.amazonaws" level="INFO"/>
-  <logger name="com.amazonaws.request" level="WARN"/>
-  <logger name="sun.rmi" level="INFO"/> 
-  <logger name="datomic.spy.memcached" level="INFO"/>
-  <logger name="com.ning.http.client.providers.netty" level="INFO"/>
-  <logger name="org.eclipse.jetty" level="INFO"/>
-  <logger name="org.hornetq.core.client.impl" level="INFO"/>
-  <logger name="org.apache.tomcat.jdbc.pool" level="INFO"/>
-
-  <logger name="datomic.cast2slf4j" level="DEBUG"/>
-
-  <root level="info">
-    <appender-ref ref="MAIN"/>
-  </root>
-</configuration>
diff --git a/datomic-pro-1.0.7469/conf/logback.xml b/datomic-pro-1.0.7469/conf/logback.xml
new file mode 100644
index 0000000..46a3b09
--- /dev/null
+++ b/datomic-pro-1.0.7469/conf/logback.xml
@@ -0,0 +1,43 @@
+<configuration>
+
+  <!-- prevent per-message overhead for jul logging calls, e.g. Hornet -->
+  <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
+    <resetJUL>true</resetJUL>
+  </contextListener>
+
+  <appender name="STDERR" class="ch.qos.logback.core.ConsoleAppender" target="System.err">
+    <encoder>
+      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %-10contextName %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <logger name="datomic.cast2slf4j" level="INFO"/>
+  <logger name="datomic.kv-cluster" level="INFO"/>
+  <logger name="datomic.lifecycle" level="INFO"/>
+  <logger name="datomic.transaction" level="INFO"/>
+  <logger name="datomic.peer" level="INFO"/>
+  <logger name="datomic.log" level="INFO"/>
+  <logger name="datomic.connector" level="INFO"/>
+  <logger name="datomic.garbage" level="INFO"/>
+  <logger name="datomic.index" level="INFO"/>
+
+  <!-- these namespsaces create a ton of log noise -->
+  <logger name="org.apache.activemq.audit" level="WARN"/>
+  <logger name="httpclient" level="INFO"/>
+  <logger name="org.apache.commons.httpclient" level="INFO"/>
+  <logger name="org.apache.http" level="INFO"/>
+  <logger name="org.jets3t" level="INFO"/>
+  <logger name="com.amazonaws" level="INFO"/>
+  <logger name="com.amazonaws.request" level="WARN"/>
+  <logger name="sun.rmi" level="INFO"/> 
+  <logger name="datomic.spy.memcached" level="INFO"/>
+  <logger name="com.ning.http.client.providers.netty" level="INFO"/>
+  <logger name="org.eclipse.jetty" level="INFO"/>
+  <logger name="org.eclipse.jetty.util.log" level="INFO"/>
+  <logger name="org.hornetq.core.client.impl" level="INFO"/>
+  <logger name="org.apache.tomcat.jdbc.pool" level="INFO"/>
+
+  <root level="INFO">
+    <appender-ref ref="STDERR"/>
+  </root>
+</configuration>
diff --git a/datomic-pro-1.0.7469/transactor.properties b/datomic-pro-1.0.7469/conf/transactor.properties
index e5d07fa..e5d07fa 100644
--- a/datomic-pro-1.0.7469/transactor.properties
+++ b/datomic-pro-1.0.7469/conf/transactor.properties
diff --git a/datomic-pro-1.0.7469/transactor b/datomic-pro-1.0.7469/transactor
new file mode 100755
index 0000000..fcd6162
--- /dev/null
+++ b/datomic-pro-1.0.7469/transactor
@@ -0,0 +1,17 @@
+#!/bin/sh
+set -euo pipefail
+
+sqlite3 storage.db < init.sql
+mkdir -p tmp cache
+
+exec java \
+	-server \
+	-Djava.security.manager=allow \
+	-Xms4g \
+	-Xmx4g \
+	-XX:+UseG1GC \
+	-XX:MaxGCPauseMillis=50 \
+	--class-path 'conf/:lib/*' \
+	clojure.main \
+	--main datomic.launcher \
+	conf/transactor.properties