Changeset 789

Timestamp:

Nov 4, 2016, 4:58:41 PM (8 years ago)

Author:

knut

Message:

Added support for include mechanism in the main.cfg file. An [include] block can be added in main.cfg, like this:

[include]
servicename1 = /my/service/repository/service1.zcfg
servicename2 = /my/service/repository/service2.zcfg
...

The word "include" thus has a special (reserved) meaning, just as "main" does. If necessary, a user may change "include" to something else by redefining the IMPORTSERVICE macro.

The service name (left hand side) should match the [service name] in the config (zcfg) file, but the path/file name (right hand side) may be arbitrary.

When handling requests, Zoo will first check if there is an [include] block, then recursively search the working directory (CWD) and subdirectories as before. If an [include]d service happens to be located in a CWD (sub)directory, it will be published by its [include]d name.

As currently implemented, Zoo will search CWD for the library files of [include]d services if the libPath parameter is not set (note that presently only C and PHP services support the libPath parameter).

Added new function (zoo_path_compare) to check if two path strings refer to the same physical file. It should handle symbolic links (typically, Linux/Unix?) and different path separators (typically, Windows).

Location:

trunk/zoo-project/zoo-kernel

Files:

• server_internal.c (modified) (1 diff)
• server_internal.h (modified) (2 diffs)
• zoo_service_loader.c (modified) (5 diffs)

trunk/zoo-project/zoo-kernel/server_internal.c

@@ -35 +35 @@
 #endif
 #include <signal.h>
+
+// #include <stdlib.h>
+/*
+ * Compare two file path strings to see if they refer to the same file.
+ *
+ * @param path1 the first file path
+ * @param path2 the second file path
+ * 
+ * @return 0 if the files are identical
+ */
+#define PATHBUFSIZE 4096
+int zoo_path_compare(char* path1, char* path2) {
+
+  if (path1 == NULL || path2 == NULL) {
+    return -1;
+  }
+
+  char realpath1[PATHBUFSIZE];
+  char realpath2[PATHBUFSIZE];
+
+#ifdef WIN32 
+  int res1 = GetFullPathName(path1, PATHBUFSIZE, realpath1, NULL);
+  int res2 = GetFullPathName(path2, PATHBUFSIZE, realpath2, NULL);
+
+  if (res1 == 0 || res2 == 0) {
+    return -1;
+  }
+  else {
+    return strncasecmp(realpath1, realpath2, PATHBUFSIZE);
+  }
+#else
+  char* ptr1 = realpath(path1, realpath1);
+  char* ptr2 = realpath(path2, realpath2);
+
+  if (ptr1 == NULL || ptr2 == NULL) {
+    return -1;
+  }
+  else {
+    return strncmp(realpath1, realpath2, PATHBUFSIZE);
+  }
+#endif
+}
 
 /**

trunk/zoo-project/zoo-kernel/server_internal.h

@@ -25 +25 @@
 #ifdef WIN32
 #pragma comment(lib, "rpcrt4.lib")
+#endif
+
+#ifndef IMPORTSERVICE
+#define IMPORTSERVICE "include" // default name of [include] block in main.cfg
 #endif
 
@@ -66 +70 @@
   int createRegistry (maps*,registry **,char *);
 
+  int zoo_path_compare(char* path1, char* path2);
+
 #ifdef WIN32
   char* getMapsAsKVP(maps*,int,int);

trunk/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -287 +287 @@
             memset (tmps1, 0, 1024);
             snprintf (tmps1, 1024, "%s/%s", conf_dir, dp->d_name);
-            service *s1 = (service *) malloc (SERVICE_SIZE);
-            if (s1 == NULL)
-              {
-                dup2 (saved_stdout, fileno (stdout));
-                errorException (m, _("Unable to allocate memory"),
-                                "InternalError", NULL);
-                return -1;
-              }
-#ifdef DEBUG
-            fprintf (stderr, "#################\n%s\n#################\n",
-                     tmps1);
-#endif
+
             char *tmpsn = zStrdup (dp->d_name);
             tmpsn[strlen (tmpsn) - 5] = 0;
-            t = readServiceFile (m, tmps1, &s1, tmpsn);
-            free (tmpsn);
-            if (t < 0)
-              {
-                map *tmp00 = getMapFromMaps (m, "lenv", "message");
-                char tmp01[1024];
-                if (tmp00 != NULL)
-                  sprintf (tmp01, _("Unable to parse the ZCFG file: %s (%s)"),
-                           dp->d_name, tmp00->value);
-                else
-                  sprintf (tmp01, _("Unable to parse the ZCFG file: %s."),
-                           dp->d_name);
-                dup2 (saved_stdout, fileno (stdout));
-                errorException (m, tmp01, "InternalError", NULL);
-                return -1;
-              }
-#ifdef DEBUG
-            dumpService (s1);
-            fflush (stdout);
-            fflush (stderr);
-#endif
-            inheritance(r,&s1);
-            func (r, m, n, s1);
-            freeService (&s1);
-            free (s1);
-            scount++;
+            
+            map* import = getMapFromMaps (m, IMPORTSERVICE, tmpsn);
+            if (import == NULL || import->value == NULL || zoo_path_compare(tmps1, import->value) != 0 ) { // service is not in [include] block 
+              service *s1 = (service *) malloc (SERVICE_SIZE);
+              if (s1 == NULL)
+                {
+                  dup2 (saved_stdout, fileno (stdout));
+                  errorException (m, _("Unable to allocate memory"),
+                                  "InternalError", NULL);
+                  return -1;
+                }
+  #ifdef DEBUG
+              fprintf (stderr, "#################\n%s\n#################\n",
+                       tmps1);
+  #endif
+              t = readServiceFile (m, tmps1, &s1, tmpsn);
+              free (tmpsn);
+              if (t < 0)
+                {
+                  map *tmp00 = getMapFromMaps (m, "lenv", "message");
+                  char tmp01[1024];
+                  if (tmp00 != NULL)
+                    sprintf (tmp01, _("Unable to parse the ZCFG file: %s (%s)"),
+                             dp->d_name, tmp00->value);
+                  else
+                    sprintf (tmp01, _("Unable to parse the ZCFG file: %s."),
+                             dp->d_name);
+                  dup2 (saved_stdout, fileno (stdout));
+                  errorException (m, tmp01, "InternalError", NULL);
+                  return -1;
+                }
+  #ifdef DEBUG
+              dumpService (s1);
+              fflush (stdout);
+              fflush (stderr);
+  #endif
+        inheritance(r,&s1);
+              func (r, m, n, s1);
+              freeService (&s1);
+              free (s1);
+              scount++;
+            }
           }
       }
@@ -1245 +1250 @@
       int saved_stdout = dup (fileno (stdout));
       dup2 (fileno (stderr), fileno (stdout));
+
+      maps* imports = getMaps(m, IMPORTSERVICE);
+      if (imports != NULL) {       
+        map* zcfg = imports->content;
+        
+        while (zcfg != NULL) {
+          if (zcfg->value != NULL) {
+            service* svc = (service*) malloc(SERVICE_SIZE);
+            if (svc == NULL || readServiceFile(m, zcfg->value, &svc, zcfg->name) < 0) {
+              // pass over silently
+              zcfg = zcfg->next;
+              continue;
+            }
+            inheritance(zooRegistry, &svc);
+            printGetCapabilitiesForProcess(zooRegistry, m, n, svc);
+            freeService(&svc);
+            free(svc);                             
+          }
+          zcfg = zcfg->next;
+        }            
+      }
+
       if (int res =               
           recursReaddirF (m, zooRegistry, n, conf_dir, NULL, saved_stdout, 0,
@@ -1345 +1372 @@
             if (strcasecmp ("all", orig) == 0)
               {
+                maps* imports = getMaps(m, IMPORTSERVICE); 
+                if (imports != NULL) {       
+                  map* zcfg = imports->content;
+            
+                  while (zcfg != NULL) {
+                    if (zcfg->value != NULL) {
+                      service* svc = (service*) malloc(SERVICE_SIZE);
+                      if (svc == NULL || readServiceFile(m, zcfg->value, &svc, zcfg->name) < 0) {
+                        // pass over silently
+                        zcfg = zcfg->next;
+                        continue;
+                      }
+                      inheritance(zooRegistry, &svc);
+                      printDescribeProcessForProcess(zooRegistry, m, n, svc);
+                      freeService(&svc);
+                      free(svc);                             
+                    }
+                    zcfg = zcfg->next;
+                  }            
+                }
+  
                 if (int res =
                     recursReaddirF (m, zooRegistry, n, conf_dir, NULL, saved_stdout, 0,
@@ -1361 +1409 @@
                     int hasVal = -1;
                     char *corig = zStrdup (tmps);
-                    if (strstr (corig, ".") != NULL)
+                    map* import = getMapFromMaps (m, IMPORTSERVICE, corig);   
+                    if (import != NULL && import->value != NULL) 
+                      {
+                        s1 = (service *) malloc (SERVICE_SIZE);
+                        t = readServiceFile (m, import->value, &s1, import->name);
+                
+                        if (t < 0) // failure reading zcfg
+                          {
+                            map *tmp00 = getMapFromMaps (m, "lenv", "message");
+                            char tmp01[1024];
+                            if (tmp00 != NULL)
+                              sprintf (tmp01, _("Unable to parse the ZCFG file: %s (%s)"), import->value, tmp00->value);
+                            else
+                              sprintf (tmp01, _("Unable to parse the ZCFG file: %s."), import->value);
+
+                            dup2 (saved_stdout, fileno (stdout));
+                            errorException (m, tmp01, "InternalError", NULL);
+            
+                            freeMaps (&m);
+                            free (m);
+
+                            if(zooRegistry!=NULL){
+                              freeRegistry(&zooRegistry);
+                              free(zooRegistry);
+                            }
+                            free (orig);
+                            free (REQUEST);
+                            closedir (dirp);
+                            xmlFreeDoc (doc);
+                            xmlCleanupParser ();
+                            zooXmlCleanupNs ();
+                    
+                            return 1;
+                          }
+#ifdef DEBUG
+                        dumpService (s1);
+#endif
+
+                        inheritance(zooRegistry,&s1);
+                        printDescribeProcessForProcess (zooRegistry,m, n, s1);
+                        freeService (&s1);
+                        free (s1);
+                        s1 = NULL;
+                        scount++;
+                        hasVal = 1;                
+                    }
+                    else if (strstr (corig, ".") != NULL)
                       {
 
@@ -1640 +1734 @@
 
   r_inputs = getMap (request_inputs, "Identifier");
-  snprintf (tmps1, 1024, "%s/%s.zcfg", conf_dir, r_inputs->value);
-#ifdef DEBUG
-  fprintf (stderr, "Trying to load %s\n", tmps1);
-#endif
-  if (strstr (r_inputs->value, ".") != NULL)
-    {
-      char *identifier = zStrdup (r_inputs->value);
-      parseIdentifier (m, conf_dir, identifier, tmps1);
-      map *tmpMap = getMapFromMaps (m, "lenv", "metapath");
-      if (tmpMap != NULL)
-        addToMap (request_inputs, "metapath", tmpMap->value);
-      free (identifier);
-    }
-  else
-    {
+
+  map* import = getMapFromMaps (m, IMPORTSERVICE, r_inputs->value); 
+  if (import != NULL && import->value != NULL) { 
+      strncpy(tmps1, import->value, 1024);
       setMapInMaps (m, "lenv", "Identifier", r_inputs->value);
       setMapInMaps (m, "lenv", "oIdentifier", r_inputs->value);
-    }
+  } 
+  else {
+    snprintf (tmps1, 1024, "%s/%s.zcfg", conf_dir, r_inputs->value);
+#ifdef DEBUG
+    fprintf (stderr, "Trying to load %s\n", tmps1);
+#endif
+    if (strstr (r_inputs->value, ".") != NULL)
+      {
+        char *identifier = zStrdup (r_inputs->value);
+        parseIdentifier (m, conf_dir, identifier, tmps1);
+        map *tmpMap = getMapFromMaps (m, "lenv", "metapath");
+        if (tmpMap != NULL)
+          addToMap (request_inputs, "metapath", tmpMap->value);
+        free (identifier);
+      }
+    else
+      {
+        setMapInMaps (m, "lenv", "Identifier", r_inputs->value);
+        setMapInMaps (m, "lenv", "oIdentifier", r_inputs->value);
+      }
+  }
 
   r_inputs = getMapFromMaps (m, "lenv", "Identifier");