Changeset 772 for trunk

Timestamp:

Jun 11, 2016, 11:48:27 AM (9 years ago)

Author:

djay

Message:

Dynamically add a [renv] section to store all environment variables available at runtime. Update the documentation to provide informations about thie new section.

Location:

trunk

Files:

• docs/kernel/configuration.rst (modified) (2 diffs)
• zoo-project/zoo-kernel/zoo_service_loader.c (modified) (7 diffs)

trunk/docs/kernel/configuration.rst

@@ -158 +158 @@
 ...............................
 
-The ``lenv`` can be used to store runtime informations automatically
-set by ZOO-Kernel before and during the execution of a WPS service,
-with the following parameters:
+The ``lenv`` section is used by the ZOO-Kernel to store runtime informations
+before the execution of a WPS service, it contains the following
+parameters:
 
  * ``sid`` (r): The WPS Service unique identifier,
@@ -169 +169 @@
  * ``cookie`` (rw): The cookie to be returned to the client (for
    example for authentication purpose).
+ * ``file.pid`` (r): The file used by the ZOO-Kernel to store process identifier.
+ * ``file.sid`` (r): The file used by the ZOO-Kernel to store service identifier.
+ * ``file.responseInit`` (r): The file used by the ZOO-Kernel to store
+   the initial (then final) WPS response.
+ * ``file.responseFinal`` (r): The file used by the ZOO-Kernel to
+   temporary store the final WPS response.
+
+renv section
+...............................
+
+The ``renv`` section is automatically created by the ZOO-Kernel before
+the execution of a WPS service, it contains all the environment
+variables available at runtime (so including the header fields in case
+it is used through http, refer to [https://tools.ietf.org/html/rfc3875
+rfc3875] for more details).
+
 
 senv section

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

@@ -102 +102 @@
 #include <time.h>
 #include <stdarg.h>
+
+#ifndef WIN32
+extern char **environ;
+#endif
 
 #ifdef WIN32
@@ -1974 +1978 @@
   dumpMap (request_inputs);
 #endif
+
+  int ei = 1;
+  char *s = 
+#ifdef WIN32
+    GetEnvironmentStrings();
+#else
+    *environ;
+#endif
+  _tmpMaps = (maps *) malloc (MAPS_SIZE);
+  _tmpMaps->name = zStrdup ("renv");
+  _tmpMaps->content = NULL;
+  _tmpMaps->next = NULL;
+  for (; s; ei++) {
+    char* tmpName=zStrdup(s);
+    char* tmpValue=strstr(s,"=")+1;
+    tmpName[strlen(tmpName)-strlen(tmpValue)-1]=0;
+    if(_tmpMaps->content == NULL)
+      _tmpMaps->content = createMap (tmpName,tmpValue);
+    else
+      addToMap (_tmpMaps->content,tmpName,tmpValue);
+    free(tmpName);
+    s = *(environ+ei);
+  }
+  addMapsToMaps (&m, _tmpMaps);
+  freeMaps (&_tmpMaps);
+  free (_tmpMaps);
+
 #ifdef WIN32
   char *cgiSidL = NULL;
@@ -2091 +2122 @@
                      strlen (usid->value) + 7) * sizeof (char));
           sprintf (fbkpid, "%s/%s.pid", r_inputs->value, usid->value);
+          setMapInMaps (m, "lenv", "file.pid", fbkpid);
 
           f0 = freopen (fbkpid, "w+",stdout);
@@ -2102 +2134 @@
                      strlen (usid->value) + 7) * sizeof (char));
           sprintf (fbkp, "%s/%s.sid", r_inputs->value, usid->value);
+          setMapInMaps (m, "lenv", "file.sid", fbkp);
           FILE* f2 = freopen (fbkp, "w+",stdout);
           printf("%s",tmpm->value);
@@ -2113 +2146 @@
           sprintf (fbkp, "%s/%s_%s.xml", r_inputs->value, r_inputs1->value,
                    usid->value);
+          setMapInMaps (m, "lenv", "file.responseInit", fbkp);
           flog =
             (char *)
@@ -2119 +2153 @@
           sprintf (flog, "%s/%s_%s_error.log", r_inputs->value,
                    r_inputs1->value, usid->value);
+          setMapInMaps (m, "lenv", "file.log", flog);
 #ifdef DEBUG
           fprintf (stderr, "RUN IN BACKGROUND MODE \n");
@@ -2160 +2195 @@
           sprintf (fbkp1, "%s/%s_final_%s.xml", r_inputs->value,
                    r_inputs1->value, usid->value);
+          setMapInMaps (m, "lenv", "file.responseFinal", fbkp1);
 
           f1 = freopen (fbkp1, "w+", stdout);