diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/configsession.py | 4 | ||||
| -rw-r--r-- | python/vyos/configsource.py | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/python/vyos/configsession.py b/python/vyos/configsession.py index cd0088b60..462a028bb 100644 --- a/python/vyos/configsession.py +++ b/python/vyos/configsession.py @@ -181,7 +181,9 @@ class ConfigSession(object): for k, v in env_list: session_env[k] = v - session_env['CONFIGSESSION_PID'] = str(session_id) + # replaces ambient instance of SESSION_PID, + # for use when running from a non-shared configsession + session_env['SESSION_PID'] = str(session_id) self.__session_env = session_env self.__session_env['COMMIT_VIA'] = app diff --git a/python/vyos/configsource.py b/python/vyos/configsource.py index 24a17c711..6bf794d9e 100644 --- a/python/vyos/configsource.py +++ b/python/vyos/configsource.py @@ -326,10 +326,11 @@ class ConfigSourceVyconfSession(ConfigSource): else: self.__session_env = None - if session_env and 'CONFIGSESSION_PID' in session_env: - self.pid = int(session_env['CONFIGSESSION_PID']) + if session_env and 'SESSION_PID' in session_env: + self.pid = int(session_env['SESSION_PID']) else: - self.pid = os.getppid() + pid = os.environ.get('SESSION_PID', '') + self.pid = int(pid) if pid else os.getppid() self._vyconf_session = VyconfSession(pid=self.pid) try: |