Changeset 2983 for trunk/packages

Timestamp:

Apr 29, 2012, 5:21:27 PM (12 years ago)

Author:

ldelgass

Message:

When setting environment for child process, overwrite existing environment (of
nanoscale). This is necessary for DISPLAY to be changed for load balancing,
since nanoscale script is setting a default DISPLAY. Also, LD_LIBRARY_PATH
was not being overwritten from the setting inherited from the rappture env
script. If we are going to the trouble to specify different environments for
the render servers in the config file, it seems we should have those settings
override the environment of nanoscale itself.

File:

• trunk/packages/vizservers/nanoscale/server2.c (modified) (1 diff)

trunk/packages/vizservers/nanoscale/server2.c

@@ -461 +461 @@
                 /* Set the screen number in the DISPLAY variable. */
                 display[3] = screenNum + '0';
-                setenv("DISPLAY", display, 0);
+                setenv("DISPLAY", display, 1);
                 /* Set the enviroment, if necessary. */
                 for (i = 0; i < serverPtr->numEnvArgs; i += 2) {
-                    setenv(serverPtr->envArgs[i], serverPtr->envArgs[i+1], 0);
+                    setenv(serverPtr->envArgs[i], serverPtr->envArgs[i+1], 1);
                 }
                 INFO("Executing %s: client %s, %s on DISPLAY=%s",