handle properly logger

src/lib66/svc_init.c

@@ -19,6 +19,9 @@
 
 #include <oblibs/error2.h>
 #include <oblibs/stralist.h>
+#include <oblibs/string.h>
+#include <oblibs/directory.h>
+#include <oblibs/types.h>
 
 #include <skalibs/genalloc.h>
 #include <skalibs/types.h>
@@ -30,57 +33,90 @@
 #include <s6/ftrigw.h>
 
 #include <66/utils.h>
+#include <66/resolve.h>
+#include <66/constants.h>
+#include <66/ssexec.h>
 
-int svc_init(char const *scandir,char const *src, genalloc *ga)
+#include <stdio.h>
+
+int svc_init(ssexec_t *info,char const *src, genalloc *ga)
 {
 	
-	int r ;
+	int r,logname ;
 	gid_t gid = getgid() ;
 	uint16_t id ;
 		
 	ftrigr_t fifo = FTRIGR_ZERO ;
 	genalloc gadown = GENALLOC_ZERO ;
-	
+	genalloc ids = GENALLOC_ZERO ; // uint16_t
+
 	tain_t deadline ;
 	tain_now_g() ;
 	tain_addsec(&deadline,&STAMP,2) ;	
 	
-	VERBO3 strerr_warnt1x("iniate fifo: fifo") ;
+	//VERBO3 strerr_warnt1x("iniate fifo") ;
 		if (!ftrigr_startf(&fifo, &deadline, &STAMP))
 			return 0 ;
 		
-	for (unsigned int i=0 ; i < genalloc_len(svstat_t,ga); i++) 
+	for (unsigned int i=0 ; i < genalloc_len(ss_resolve_t,ga); i++) 
 	{
-		char const *name = genalloc_s(svstat_t,ga)[i].name ;
-		size_t namelen = genalloc_s(svstat_t,ga)[i].namelen ;
-			
+		logname = 0 ;
+		char *string = genalloc_s(ss_resolve_t,ga)[i].sa.s ;
+		char *name = string + genalloc_s(ss_resolve_t,ga)[i].name ;
+		logname = get_rstrlen_until(name,SS_LOG_SUFFIX) ;
+		if (logname > 0) name = string + genalloc_s(ss_resolve_t,ga)[i].deps ;
+		
+		size_t namelen = strlen(name) ;
 		size_t srclen = strlen(src) ;	
 		char svsrc[srclen + 1 + namelen + 1] ;
 		memcpy(svsrc,src,srclen) ;
 		svsrc[srclen] = '/' ;
-		memcpy(svsrc + srclen + 1, name,namelen) ;
+		memcpy(svsrc + srclen + 1,name,namelen) ;
 		svsrc[srclen + 1 + namelen] = 0 ;
 		
-		size_t svscanlen = strlen(scandir) ;
-		char svscan[svscanlen + 1 + namelen + 6 + 1] ;
-		memcpy(svscan,scandir,svscanlen) ;
-		svscan[svscanlen] = '/' ;
-		memcpy(svscan + svscanlen + 1, name,namelen) ;
-		svscanlen = svscanlen + 1 + namelen ;
+		size_t svscanlen ;
+		if (logname > 0) svscanlen = strlen(string + genalloc_s(ss_resolve_t,ga)[i].runat) - SS_LOG_SUFFIX_LEN ;
+		else svscanlen = strlen(string + genalloc_s(ss_resolve_t,ga)[i].runat) ;
+		char svscan[svscanlen + 6 + 1] ;
+		memcpy(svscan,string + genalloc_s(ss_resolve_t,ga)[i].runat,svscanlen) ;
 		svscan[svscanlen] = 0 ;
 		
-		VERBO3 strerr_warnt2x("init service: ", svscan) ;
-			
-		VERBO3 strerr_warnt4x("copy: ",svsrc, " to ", svscan) ;
-		if (!hiercopy(svsrc,svscan ))
+		VERBO3 strerr_warnt2x("init service: ", string + genalloc_s(ss_resolve_t,ga)[i].name) ;
+		/** if logger was created do not pass here to avoid to erase
+		 * the fifo of the logger*/
+		if (!scan_mode(svscan,S_IFDIR))
 		{
-			VERBO3 strerr_warnwu4sys("copy: ",svsrc," to: ",svscan) ;
-			goto err ;
+			VERBO3 strerr_warnt4x("copy: ",svsrc, " to ", svscan) ;
+			if (!hiercopy(svsrc,svscan))
+			{
+				VERBO3 strerr_warnwu4sys("copy: ",svsrc," to: ",svscan) ;
+				goto err ;
+			}
+		}
+		/** if logger you need to copy again the real path */
+		svscanlen = strlen(string + genalloc_s(ss_resolve_t,ga)[i].runat) ;
+		memcpy(svscan,string + genalloc_s(ss_resolve_t,ga)[i].runat,svscanlen) ;
+		svscan[svscanlen] = 0 ;
+		/** if logger and the reload was asked the folder xxx/log doesn't exist
+		 * check it and create again if doesn't exist */
+		if (!scan_mode(svscan,S_IFDIR))
+		{
+			size_t tmplen = strlen(svsrc) ;
+			char tmp[tmplen + 4 + 1] ;
+			memcpy(tmp,svsrc,tmplen) ;
+			memcpy(tmp + tmplen,"/log",4) ;
+			tmp[tmplen + 4] = 0 ;
+			VERBO3 strerr_warnt4x("copy: ",tmp, " to ", svscan) ;
+			if (!hiercopy(tmp,svscan))
+			{
+				VERBO3 strerr_warnwu4sys("copy: ",tmp," to: ",svscan) ;
+				goto err ;
+			}
 		}
 		memcpy(svscan + svscanlen, "/down", 5) ;
 		svscan[svscanlen + 5] = 0 ;
-		
-		if (!genalloc_s(svstat_t,ga)[i].down)
+	
+		if (!genalloc_s(ss_resolve_t,ga)[i].down)
 		{
 			if (!stra_add(&gadown,svscan))
 			{
@@ -111,36 +147,40 @@ int svc_init(char const *scandir,char const *src, genalloc *ga)
 			VERBO3 strerr_warnwu2x("subcribe to fifo: ",svscan) ;
 			goto err ;
 		}
+		if (!genalloc_append(uint16_t, &ids, &id)) goto err ;
 	}
-	VERBO3 strerr_warnt2x("reload scandir: ",scandir) ;
-	r = s6_svc_writectl(scandir, S6_SVSCAN_CTLDIR, "an", 2) ;
+	VERBO3 strerr_warnt2x("reload scandir: ",info->scandir.s) ;
+	r = s6_svc_writectl(info->scandir.s, S6_SVSCAN_CTLDIR, "an", 2) ;
 	if (r < 0)
 	{
-		VERBO3 strerr_warnw3sys("something is wrong with the ",scandir, "/" S6_SVSCAN_CTLDIR " directory. errno reported") ;
+		VERBO3 strerr_warnw3sys("something is wrong with the ",info->scandir.s, "/" S6_SVSCAN_CTLDIR " directory. errno reported") ;
 		goto err ;
 	}
 	if (!r)
 	{
-		VERBO3 strerr_warnw3x("scandir: ",scandir, " is not running, make a bug report") ;
+		VERBO3 strerr_warnw3x("scandir: ",info->scandir.s, " is not running, make a bug report") ;
 		goto err ;
 	}
 	
 	VERBO3 strerr_warnt1x("waiting for events on fifo") ;
-	if (ftrigr_wait_and_g(&fifo, &id, 1, &deadline) < 0)
+	if (ftrigr_wait_and_g(&fifo, genalloc_s(uint16_t, &ids), genalloc_len(uint16_t, &ids), &deadline) < 0)
 			goto err ;
 	
 	for (unsigned int i = 0 ; i < genalloc_len(stralist,&gadown) ; i++)
 	{
-		VERBO3 strerr_warnt2x("delete down file for: ",genalloc_s(svstat_t,ga)[i].name) ;
+		VERBO3 strerr_warnt2x("Delete down file at: ",gaistr(&gadown,i)) ;
 		if (unlink(gaistr(&gadown,i)) < 0 && errno != ENOENT) return 0 ;
 	}
 		
 	ftrigr_end(&fifo) ;
 	genalloc_deepfree(stralist,&gadown,stra_free) ;
-	
+	genalloc_free(uint16_t, &ids) ;
 	return 1 ;
 	
 	err:
+		ftrigr_end(&fifo) ;
+		genalloc_free(uint16_t, &ids) ;
+		genalloc_deepfree(stralist,&gadown,stra_free) ;
 		ftrigr_end(&fifo) ;
 		return 0 ;