road to swarm - fix race condition on initial configuration

autoconf/AutoConf.py

@@ -1,5 +1,6 @@
 from Config import Config
 import utils
+import os
 
 class AutoConf :
 
@@ -54,11 +55,11 @@ class AutoConf :
 	def __process_instance(self, instance, event, id, name, labels) :
 		if event == "create" :
 			self.__instances[id] = instance
-			if self.__swarm :
-				if self.__config.globalconf(self.__instances) :
-					utils.log("[*] global config generated")
+			if self.__swarm and len(self.__instances) == 0 :
+				if self.__config.initconf(self.__instances) :
+					utils.log("[*] initial config succeeded")
 				else :
-					utils.log("[!] can't generate global config")
+					utils.log("[!] initial config failed")
 			utils.log("[*] bunkerized-nginx instance created : " + name + " / " + id)
 		elif event == "start" :
 			self.__instances[id].reload()
@@ -68,6 +69,11 @@ class AutoConf :
 			utils.log("[*] bunkerized-nginx instance stopped : " + name + " / " + id)
 		elif event == "destroy" or event == "remove" :
 			del self.__instances[id]
+			if self.__swarm and len(self.__instances) == 0 :
+				with open("/etc/crontabs/nginx", "w") as f :
+					f.write("")
+				if os.path.exists("/etc/nginx/autoconf") :
+					os.remove("/etc/nginx/autoconf")
 			utils.log("[*] bunkerized-nginx instance removed : " + name + " / " + id)
 
 	def __process_server(self, instance, event, id, name, labels) :

autoconf/Config.py

@@ -9,6 +9,33 @@ class Config :
 		self.__swarm = swarm
 		self.__api = api
 
+
+	def initconf(self, instances) :
+		try :
+			for instance_id, instance in instances.items() :
+				env = instance.attrs["Spec"]["TaskTemplate"]["ContainerSpec"]["Env"]
+				break
+			vars = {}
+			for var_value in env :
+				var = var_value.split("=")[0]
+				value = var_value.replace(var + "=", "", 1)
+				vars[var] = value
+			if self.globalconf(instances) :
+				i = 0
+				started = False
+				while i < 5 :
+					if self.__status(instances) :
+						started = True
+					i = i + 1
+					time.sleep(i)
+				if started :
+					proc = subprocess.run(["/bin/su", "-s", "/opt/entrypoint/jobs.sh", "nginx"], env=vars, capture_output=True)
+					return proc.returncode == 0
+		except Exception as e :
+			traceback.print_exc()
+			utils.log("[!] Error while initializing config : " + str(e))
+		return False
+
 	def globalconf(self, instances) :
 		try :
 			for instance_id, instance in instances.items() :
@@ -19,7 +46,7 @@ class Config :
 				var = var_value.split("=")[0]
 				value = var_value.replace(var + "=", "", 1)
 				vars[var] = value
-			proc = subprocess.run(["/opt/entrypoint/global-config.sh"], env=vars, capture_output=True)
+			proc = subprocess.run(["/bin/su", "-s", "/opt/entrypoint/global-config.sh", "nginx"], env=vars, capture_output=True)
 			if proc.returncode == 0 :
 				with open("/etc/nginx/autoconf", "w") as f :
 					f.write("ok")
@@ -46,9 +73,9 @@ class Config :
 			vars_defaults.update(vars_instances)
 			vars_defaults.update(vars)
 			# Call site-config.sh to generate the config
-			proc = subprocess.run(["/opt/entrypoint/site-config.sh", vars["SERVER_NAME"]], env=vars_defaults, capture_output=True)
+			proc = subprocess.run(["/bin/su", "-s", "/bin/sh", "-c", "/opt/entrypoint/site-config.sh" + " " + vars["SERVER_NAME"], "nginx"], env=vars_defaults, capture_output=True)
 			if proc.returncode == 0 :
-				proc = subprocess.run(["/opt/entrypoint/multisite-config.sh"], capture_output=True)
+				proc = subprocess.run(["/bin/su", "-s", "/opt/entrypoint/multisite-config.sh", "nginx"], capture_output=True)
 				return proc.returncode == 0
 		except Exception as e :
 			traceback.print_exc()
@@ -65,7 +92,7 @@ class Config :
 			# Include the server conf
 			utils.replace_in_file("/etc/nginx/nginx.conf", "}", "include /etc/nginx/" + vars["SERVER_NAME"] + "/server.conf;\n}")
 
-			return self.reload(instances)
+			return self.__reload(instances)
 		except Exception as e :
 			utils.log("[!] Error while activating config : " + str(e))
 		return False
@@ -80,7 +107,7 @@ class Config :
 			# Remove the include
 			utils.replace_in_file("/etc/nginx/nginx.conf", "include /etc/nginx/" + vars["SERVER_NAME"] + "/server.conf;\n", "")
 
-			return self.reload(instances)
+			return self.__reload(instances)
 
 		except Exception as e :
 			utils.log("[!] Error while deactivating config : " + str(e))
@@ -100,7 +127,13 @@ class Config :
 			utils.log("[!] Error while deactivating config : " + str(e))
 		return False
 
-	def reload(self, instances) :
+	def __reload(self, instances) :
+		return self.__api(instances, "/reload")
+
+	def __status(self, instances) :
+		return self.__api(instances, "/status")
+
+	def __api(self, instances, path) :
 		ret = True
 		for instance_id, instance in instances.items() :
 			# Reload the instance object just in case
@@ -113,7 +146,7 @@ class Config :
 					nodeID = task["NodeID"]
 					taskID = task["ID"]
 					fqdn = name + "." + nodeID + "." + taskID
-					req = requests.post("http://" + fqdn + ":8080" + self.__api + "/reload")
+					req = requests.post("http://" + fqdn + ":8080" + self.__api + path)
 					if req and req.status_code == 200 :
 						utils.log("[*] Sent reload order to instance " + fqdn + " (service.node.task)")
 					else :