Merge pull request #667 from skuhl/server-version-print-early

Print server's python version earlier
This commit is contained in:
Brian May 2021-07-30 07:52:28 +10:00 committed by GitHub
commit 7d44e890eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

View File

@ -1,8 +1,12 @@
import sys
import zlib
import types
import platform
verbosity = verbosity # noqa: F821 must be a previously defined global
if verbosity > 0:
sys.stderr.write(' s: Running server on remote host with %s (version %s)\n'
% (sys.executable, platform.python_version()))
z = zlib.decompressobj()
while 1:
name = sys.stdin.readline().strip()

View File

@ -5,7 +5,6 @@ import traceback
import time
import sys
import os
import platform
import sshuttle.ssnet as ssnet
@ -272,8 +271,6 @@ def main(latency_control, latency_buffer_size, auto_hosts, to_nameserver,
auto_nets):
try:
helpers.logprefix = ' s: '
debug1('Starting server with Python version %s'
% platform.python_version())
debug1('latency control setting = %r' % latency_control)
if latency_buffer_size: