Merge pull request #206 from tmaeno/master

added disableHTTP + short retry interval for adder

Dockerfile

@@ -47,7 +47,7 @@ RUN mkdir -p /data/atlpan
 RUN mkdir -p /var/log/panda/wsgisocks
 RUN mkdir -p /var/log/panda/pandacache
 RUN mkdir -p /run/httpd/wsgisocks
-RUN mkdir -p /var/cache/pandaserver/jedilog
+RUN mkdir -p /var/log/panda/pandacache/jedilog
 RUN mkdir -p /var/run/panda
 RUN mkdir -p /var/cric
 
@@ -71,7 +71,6 @@ RUN chmod -R 777 /var/log/panda
 RUN chmod -R 777 /run/httpd
 RUN chmod -R 777 /home/atlpan
 RUN chmod -R 777 /var/lock
-RUN chmod -R 777 /var/cache/pandaserver
 RUN chmod -R 777 /var/log/panda/pandacache
 RUN chmod -R 777 /var/run/panda
 RUN chmod -R 777 /var/lib/logrotate

PandaPkgInfo.py

@@ -1 +1 @@
-release_version = "0.0.51"
+release_version = "0.0.52"

pandaserver/config/panda_config.py

@@ -35,6 +35,10 @@
 if 'pserverhosthttp' not in tmpSelf.__dict__:
     tmpSelf.__dict__['pserverhosthttp'] = tmpSelf.__dict__['pserverhost']
 
+# disable http
+if 'disableHTTP' not in tmpSelf.__dict__:
+    tmpSelf.__dict__['disableHTTP'] = False
+
 # change the number of database connections for FastCGI/WSGI
 if tmpSelf.__dict__['useFastCGI'] or tmpSelf.__dict__['useWSGI']:
     tmpSelf.__dict__['nDBConnection'] = tmpSelf.__dict__['nDBConForFastCGIWSGI']

pandaserver/daemons/scripts/add_main.py

@@ -44,7 +44,7 @@ def main(argv=tuple(), tbuf=None, **kwargs):
     lock_interval = 10
 
     # retry interval in minutes
-    retry_interval = 3
+    retry_interval = 1
 
     # instantiate TB
     if tbuf is None: