Handle HOSTNAME in docker-initialize.py for log names

Author: odelaere

docker/docker-compose.yml

@@ -17,12 +17,13 @@ services:
     mem_limit: 200M
     mem_reservation: 150M
   zeo:
-    image: imiobe/iadelib:4.2.8
+    image: imiobe/iadelib:4.2.9
     command: zeoserver
     environment:
       - MOUNTPOINT
+      - HOSTNAME=zeo
     volumes:
-      - ./data:/data
+      - ../var/:/data
       - tmp:/tmp
       - vartmp:/var/tmp
     networks:
@@ -32,7 +33,7 @@ services:
 #    restart:
 #      unless-stopped
   instance1:
-    image: imiobe/iadelib:4.2.8
+    image: imiobe/iadelib:4.2.9
     command: instance
     ports:
       - "20081:8081"
@@ -49,14 +50,15 @@ services:
       - ADMIN_PASSWORD=admin
       - CLUSTER=iadelib_pm42
       - MOUNTPOINT
+      - HOSTNAME=instance1
     volumes:
-      - ./data:/data
+      - ../var/:/data
       - tmp:/tmp
       - vartmp:/var/tmp
     labels:
       SERVICE_NAME: "instance1"
   instance2:
-    image: imiobe/iadelib:4.2.8
+    image: imiobe/iadelib:4.2.9
     command: instance
     ports:
       - "20082:8081"
@@ -73,14 +75,15 @@ services:
       - ADMIN_PASSWORD=admin
       - CLUSTER=iadelib_pm42
       - MOUNTPOINT
+      - HOSTNAME=instance2
     volumes:
-      - ./data:/data
+      - ../var/:/data
       - tmp:/tmp
       - vartmp:/var/tmp
     labels:
       SERVICE_NAME: "instance2"
   instance3:
-    image: imiobe/iadelib:4.2.8
+    image: imiobe/iadelib:4.2.9
     command: instance
     ports:
       - "20083:8081"
@@ -97,16 +100,17 @@ services:
       - ADMIN_PASSWORD=admin
       - CLUSTER=iadelib_pm42
       - MOUNTPOINT
+      - HOSTNAME=instance3
     volumes:
-      - ./data:/data
+      - ../var/:/data
       - tmp:/tmp
       - vartmp:/var/tmp
     labels:
       SERVICE_NAME: "instance3"
 #    restart:
 #      unless-stopped
   worker-cron:
-    image: imiobe/iadelib:4.2.8
+    image: imiobe/iadelib:4.2.9
     command: instance-cron
     ports:
       - "8087"
@@ -123,16 +127,17 @@ services:
       - PLONE_PATH=PM
       - CLUSTER=iadelib_pm42
       - MOUNTPOINT
+      - HOSTNAME=worker-cron
     volumes:
-      - ./data:/data
+      - ../var/:/data
       - tmp:/tmp
       - vartmp:/var/tmp
     labels:
       SERVICE_NAME: "worker-cron"
     restart:
       unless-stopped
   worker-async:
-    image: imiobe/iadelib:4.2.8
+    image: imiobe/iadelib:4.2.9
     command: instance-async
     networks:
       - internal
@@ -146,16 +151,17 @@ services:
       - ADMIN_PASSWORD=admin
       - CLUSTER=iadelib_pm42
       - MOUNTPOINT
+      - HOSTNAME=worker-async
     volumes:
-      - ./data:/data
+      - ../var/:/data
       - tmp:/tmp
       - vartmp:/var/tmp
     labels:
       SERVICE_NAME: "worker-async"
 #    restart:
 #      unless-stopped
   worker-amqp:
-    image: imiobe/iadelib:4.2.8
+    image: imiobe/iadelib:4.2.9
     command: instance-amqp
     ports:
       - "20085:8081"
@@ -180,16 +186,17 @@ services:
       - MQ_PORT
       - MQ_LOGIN
       - MQ_PASSWORD
+      - HOSTNAME=worker-amqp
     volumes:
-      - ./data:/data
+      - ../var/:/data
       - tmp:/tmp
       - vartmp:/var/tmp
     labels:
       SERVICE_NAME: "worker-cron"
 #    restart:
 #      unless-stopped
   debug:
-    image: imiobe/iadelib:4.2.8
+    image: imiobe/iadelib:4.2.9
     entrypoint: bash
     ports:
       - "20089:8081"
@@ -206,8 +213,9 @@ services:
       - ADMIN_PASSWORD=admin
       - CLUSTER=iadelib_pm42
       - MOUNTPOINT
+      - HOSTNAME=debug
     volumes:
-      - ./data:/data
+      - ../var/:/data
       - tmp:/tmp
       - vartmp:/var/tmp
     labels:

docker/docker-initialize.py

@@ -35,19 +35,23 @@ def __init__(
     def _fix(self, path, activate_big_bang):
         with open(path) as file:
             filedata = file.read()
-        filedata = re.sub(r'server.*?8100', 'server ' + self.server, filedata, 99)
+        filedata = re.sub(r'server.*?8100', 'server ' + self.server, filedata)
         filedata = filedata.replace('http://localhost/Plone', self.url)
-        filedata = re.sub(r'ZEOADDRESS.*?8100', 'ZEOADDRESS ' + self.server, filedata, 99)
+        filedata = re.sub(r'ZEOADDRESS.*?8100', 'ZEOADDRESS ' + self.server, filedata)
         filedata = filedata.replace('$(ZEO_ADDRESS)', self.server)
-        filedata = re.sub(r'cache-size.*?1000MB', 'cache-size ' + self.zeo_client_cache_size, filedata, 99)
-        filedata = re.sub(r'cache-size.*?100000', 'cache-size ' + self.zodb_cache_size, filedata, 99)
+        filedata = re.sub(r'cache-size.*?1000MB', 'cache-size ' + self.zeo_client_cache_size, filedata)
+        filedata = re.sub(r'cache-size.*?100000', 'cache-size ' + self.zodb_cache_size, filedata)
         filedata = filedata.replace('Plone/@@cron-tick', self.plone_path + '/@@cron-tick ')
-        filedata = re.sub(r'ACTIVE_BIGBANG.*?(True|False)', 'ACTIVE_BIGBANG ' + str(activate_big_bang), filedata, 99)
+        filedata = re.sub(r'ACTIVE_BIGBANG.*?(True|False)', 'ACTIVE_BIGBANG ' + str(activate_big_bang), filedata)
+        filedata = re.sub(r'path /data/log/instance.*.log', 'path /data/log/' + self.hostname + '.log', filedata)
+        filedata = re.sub(r'path /plone/var/log/instance.*-Z2.log',
+                          'path /data/log/' + self.hostname + '-Z2.log',
+                          filedata)
         return filedata
 
     def _fix_conf(self, path, activate_big_bang):
         filedata = self._fix(path, activate_big_bang)
-        filedata = re.sub(r'password.*?admin', 'password ' + self.admin_password, filedata, 99)
+        filedata = re.sub(r'password.*?admin', 'password ' + self.admin_password, filedata)
         with open(path, 'w') as file:
             file.write(filedata)
 
@@ -58,23 +62,18 @@ def _fix_amqp(self, activate_big_bang=False):
         mq_login = self.env.get('MQ_LOGIN', 'guest')
         mq_password = self.env.get('MQ_PASSWORD', 'guest')
 
-        filedata = re.sub(r'site_id.*?Plone', 'site_id ' + self.plone_path, filedata, 99)
-        filedata = re.sub(r'client_id.*?019999', 'client_id ' + self.mq_client_id, filedata, 99)
-        filedata = re.sub(r'routing_key.*?019999', 'routing_key ' + self.mq_client_id, filedata, 99)
+        filedata = re.sub(r'site_id.*?Plone', 'site_id ' + self.plone_path, filedata)
+        filedata = re.sub(r'client_id.*?019999', 'client_id ' + self.mq_client_id, filedata)
+        filedata = re.sub(r'routing_key.*?019999', 'routing_key ' + self.mq_client_id, filedata)
 
-        filedata = re.sub(r'ws_url.*?http://localhost:6543', 'ws_url ' + self.mq_ws_url, filedata, 99)
-        filedata = re.sub(r'ws_login.*?testuser', 'ws_login ' + self.mq_ws_login, filedata, 99)
-        filedata = re.sub(r'ws_password.*?test', 'ws_password ' + self.mq_ws_password, filedata, 99)
+        filedata = re.sub(r'ws_url.*?http://localhost:6543', 'ws_url ' + self.mq_ws_url, filedata)
+        filedata = re.sub(r'ws_login.*?testuser', 'ws_login ' + self.mq_ws_login, filedata)
+        filedata = re.sub(r'ws_password.*?test', 'ws_password ' + self.mq_ws_password, filedata)
 
-        filedata = re.sub(r'hostname.*?127.0.0.1', 'hostname ' + mq_host, filedata, 99)
-        filedata = re.sub(r'port.*?5672', 'port ' + mq_port, filedata, 99)
-        filedata = re.sub(r'^ *password*?guest', 'password ' + mq_password, filedata, 99)
-        filedata = re.sub(r'username.*?guest', 'username ' + mq_login, filedata, 99)
-
-        filedata = re.sub(r'path /data/log/instance.*.log', 'path /data/log/' + self.hostname + '.log', filedata, 99)
-        filedata = re.sub(r'path /plone/var/log/instance.*.log',
-                          'path /data/log/' + self.hostname + '.log',
-                          filedata, 99)
+        filedata = re.sub(r'hostname.*?127.0.0.1', 'hostname ' + mq_host, filedata)
+        filedata = re.sub(r'port.*?5672', 'port ' + mq_port, filedata)
+        filedata = re.sub(r'^ *password*?guest', 'password ' + mq_password, filedata)
+        filedata = re.sub(r'username.*?guest', 'username ' + mq_login, filedata)
 
         with open(self.instance_amqp_conf, 'w') as file:
             file.write(filedata)