Acquire `display`ed messages from forked process (#36064)

Also restore verbosity value from loaded `play_context`
pull/36123/head
Nathaniel Case 7 years ago committed by GitHub
parent 69be2c169f
commit 527fc492b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -70,6 +70,7 @@ class ConnectionProcess(object):
self.connection._connect() self.connection._connect()
self.connection._socket_path = self.socket_path self.connection._socket_path = self.socket_path
self.srv.register(self.connection) self.srv.register(self.connection)
messages.extend(sys.stdout.getvalue().splitlines())
messages.append('connection to remote device started successfully') messages.append('connection to remote device started successfully')
self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
@ -189,6 +190,7 @@ def main():
play_context = PlayContext() play_context = PlayContext()
play_context.deserialize(pc_data) play_context.deserialize(pc_data)
display.verbosity = play_context.verbosity
except Exception as e: except Exception as e:
rc = 1 rc = 1
@ -278,6 +280,7 @@ def main():
sys.exit(rc) sys.exit(rc)
if __name__ == '__main__': if __name__ == '__main__':
display = Display() display = Display()
main() main()

Loading…
Cancel
Save