Changed to keep map of DNS addresses due to 5 second DNS delays.

Author: jgates108

admin/templates/configuration/etc/log4cxx.index.properties

@@ -5,8 +5,9 @@
 # export LSST_LOG_CONFIG=$HOME/.lsst/log4cxx.unittest.properties
 #
 
-#log4j.rootLogger=INFO, CONSOLE
-log4j.rootLogger=DEBUG, CONSOLE
+log4j.rootLogger=INFO, CONSOLE
+#log4j.rootLogger=DEBUG, CONSOLE
+#log4j.rootLogger=WARN, CONSOLE
 
 log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
 log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout

admin/templates/configuration/etc/log4cxx.index_master.properties

@@ -0,0 +1,18 @@
+#
+# Configuration file for log4cxx
+# can be used for unit test
+# by launching next command before unit tests:
+# export LSST_LOG_CONFIG=$HOME/.lsst/log4cxx.unittest.properties
+#
+
+#log4j.rootLogger=INFO, CONSOLE
+log4j.rootLogger=DEBUG, CONSOLE
+#log4j.rootLogger=WARN, CONSOLE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+#log4j.appender.CONSOLE.layout.ConversionPattern=[%d{yyyy-MM-ddTHH:mm:ss.SSSZ}] [%t] %-5p %c{2} (%F:%L) - %m%n
+log4j.appender.CONSOLE.layout.ConversionPattern=[%d{ddTHH:mm:ss.SSSZ}] [%t] %-5p %c{2} (%F:%L) - %m%n
+
+# Tune log at the module level
+#log4j.logger.lsst.qserv.util=DEBUG

admin/tools/docker/index/container/buildContainers.bash

@@ -15,7 +15,7 @@ cd admin/tools/docker/index/container/dev/worker/ && docker build -t qserv/index
 cd ../master/ && docker build -t qserv/indexmaster:dev .
 #docker build -f admin/tools/docker/index/container/dev/master/Dockerfile -t qserv/indexmaster:dev .
 
-# clinetNum
+# clientNum
 cd ../clientNum/ && docker build -t qserv/indexclientnum:dev .
 #docker build -f admin/tools/docker/index/container/dev/clientNum/Dockerfile -t qserv/indexclientnum:dev .
 

admin/tools/docker/index/container/dev/Dockerfile.old

@@ -11,5 +11,3 @@ RUN yum update --assumeyes && yum install --assumeyes bind-utils
 USER 1000
 
 ENTRYPOINT ["/home/qserv/dev/qserv/admin/tools/docker/index/container/dev/clientNum/appClientNum.bash"]
-#ENTRYPOINT ["/bin/bash", "-lc", "/home/qserv/dev/qserv/admin/tools/docker/index/container/dev/clientNum/appClientNum.bash"]
-# CMD ["1 500000"]

admin/tools/docker/index/container/dev/README

@@ -1,19 +1,9 @@
 #! /bin/bash -l
-# admin/tools/docker/loader/container/dev/clientNum/appClientNum.bash
-
-_term() { 
-  echo "Caught SIGTERM signal!" 
-  kill -TERM "$child" 2>/dev/null
-}
-
-trap _term SIGTERM
-trap _term SIGKILL
-
+# admin/tools/docker/loader/container/dev/clientNum/appClientNumScreen.bash
 
 echo appClientScreen $1 $2 $3
 
 screen -dm /home/qserv/dev/qserv/admin/tools/docker/index/container/dev/clientNum/appClientNum $1 $2 $3 
 
-child=$!
-wait "$child"
+
 tail -f /dev/null

admin/tools/docker/index/container/dev/clientNum/Dockerfile

@@ -13,7 +13,7 @@ source /qserv/stack/loadLSST.bash
 cd /home/qserv/dev/qserv
 setup -r . -t qserv-dev
 
-export LSST_LOG_CONFIG=/home/qserv/dev/qserv/admin/templates/configuration/etc/log4cxx.index.properties
+export LSST_LOG_CONFIG=/home/qserv/dev/qserv/admin/templates/configuration/etc/log4cxx.index_master.properties
 
 /home/qserv/dev/qserv/build/loader/appMaster /home/qserv/dev/qserv/core/modules/loader/config/master.cnf
 

admin/tools/docker/index/container/dev/clientNum/appClientNumScreen.bash

@@ -20,6 +20,3 @@ export LSST_LOG_CONFIG=/home/qserv/dev/qserv/admin/templates/configuration/etc/l
 child=$!
 echo "child ${child}"
 wait "$child"
-
-sleep 10000
-tail -f /dev/null

admin/tools/docker/index/container/dev/master/appMaster.bash

@@ -1,19 +1,7 @@
 #! /bin/bash
-# admin/tools/docker/loader/container/dev/worker/appWorker.bash
+# admin/tools/docker/loader/container/dev/worker/appWorkerScreen.bash
 
-_term() { 
-  echo "Caught SIGTERM signal!" 
-  kill -TERM "$child" 2>/dev/null
-}
-
-trap _term SIGTERM
-trap _term SIGKILL
 
 screen -dm /home/qserv/dev/qserv/admin/tools/docker/index/container/dev/worker/appWorker.bash
 
-child=$!
-echo "child ${child}"
-wait "$child"
-
-sleep 10000
 tail -f /dev/null