Update.

Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/47b3793a
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/47b3793a
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/47b3793a

Branch: refs/heads/master
Commit: 47b3793a1ad8cb48be87dade29a272f0f97d2cc9
Parents: 1584dc4
Author: Dave George <[email protected]>
Authored: Fri Apr 6 17:12:58 2018 +0000
Committer: Dave George <[email protected]>
Committed: Fri Apr 6 17:12:58 2018 +0000

----------------------------------------------------------------------
 core/sqf/monitor/linux/nscommacceptmon.cxx | 2 ++
 core/sqf/monitor/linux/process.cxx         | 5 +++++
 2 files changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafodion/blob/47b3793a/core/sqf/monitor/linux/nscommacceptmon.cxx
----------------------------------------------------------------------
diff --git a/core/sqf/monitor/linux/nscommacceptmon.cxx 
b/core/sqf/monitor/linux/nscommacceptmon.cxx
index 3e02e62..763d324 100644
--- a/core/sqf/monitor/linux/nscommacceptmon.cxx
+++ b/core/sqf/monitor/linux/nscommacceptmon.cxx
@@ -313,6 +313,7 @@ void CCommAcceptMon::monReqNewProcess( struct message_def* 
msg, int sockFd )
                       "        msg.new_process_ns.pathStrId=%d:%d\n"
                       "        msg.new_process_ns.ldpathStrId=%d:%d\n"
                       "        msg.new_process_ns.programStrId=%d:%d\n"
+                      "        msg.new_process_ns.process_name=%s\n"
                       "        msg.new_process_ns.port=%s\n"
                       "        msg.new_process_ns.argc=%d\n"
                       //"        msg.new_process_ns.argv=%s\n"
@@ -347,6 +348,7 @@ void CCommAcceptMon::monReqNewProcess( struct message_def* 
msg, int sockFd )
                     , msg->u.request.u.new_process_ns.ldpathStrId.id
                     , msg->u.request.u.new_process_ns.programStrId.nid
                     , msg->u.request.u.new_process_ns.programStrId.id
+                    , msg->u.request.u.new_process_ns.process_name
                     , msg->u.request.u.new_process_ns.port_name
                     , msg->u.request.u.new_process_ns.argc
                     //, msg->u.request.u.new_process_ns.argv

http://git-wip-us.apache.org/repos/asf/trafodion/blob/47b3793a/core/sqf/monitor/linux/process.cxx
----------------------------------------------------------------------
diff --git a/core/sqf/monitor/linux/process.cxx 
b/core/sqf/monitor/linux/process.cxx
index b599840..26535d3 100644
--- a/core/sqf/monitor/linux/process.cxx
+++ b/core/sqf/monitor/linux/process.cxx
@@ -1609,6 +1609,7 @@ bool CProcess::Create (CProcess *parent, int & result)
     char nsCommPort[10];
     char nsSyncPort[10];
     char nsMon2NsPort[10];
+    char nsConfigDb[MAX_PROCESS_PATH];
     MON_Props xprops(true);
     MON_Props xprops_exe(true);
     char *xprops_exe_file;
@@ -1684,6 +1685,8 @@ bool CProcess::Create (CProcess *parent, int & result)
         STRCPY (nsSyncPort, (env?env:""));
         env = getenv ("NS_M2N_COMM_PORT");
         STRCPY (nsMon2NsPort, (env?env:""));
+        env = getenv ("SQ_CONFIGDB");
+        STRCPY (nsConfigDb, (env?env:""));
     }
     if ( Type == ProcessType_Watchdog )
     {
@@ -1866,6 +1869,8 @@ bool CProcess::Create (CProcess *parent, int & result)
             setEnvStrVal ( childEnv, nextEnv, "NS_SYNC_PORT", nsSyncPort );
         if ( nsMon2NsPort[0] )
             setEnvStrVal ( childEnv, nextEnv, "NS_M2N_COMM_PORT", nsMon2NsPort 
);
+        if (nsConfigDb[0] )
+            setEnvStrVal ( childEnv, nextEnv, "SQ_CONFIGDB", nsConfigDb );
     }
     if ( Type == ProcessType_Watchdog )
     {

Reply via email to