Updating logger to use Python 3.6.4 for better Caldera support

This commit is contained in:
Chris Long
2018-01-22 23:05:21 -08:00
parent 8112bfac42
commit 8bce148a89
4 changed files with 25 additions and 23 deletions

View File

@@ -5,7 +5,7 @@ After=multi-user.target
[Service]
Type=idle
WorkingDirectory=/home/vagrant/caldera/caldera
ExecStart=/usr/bin/python3 caldera.py
ExecStart=/usr/local/bin/python3.6 caldera.py
[Install]
WantedBy=multi-user.target

View File

@@ -1,14 +0,0 @@
--- sslproto.py 2018-01-17 08:00:50.567571454 +0000
+++ sslproto.py.new 2018-01-17 08:03:31.996275969 +0000
@@ -533,8 +533,10 @@
def _get_extra_info(self, name, default=None):
if name in self._extra:
return self._extra[name]
- else:
+ elif self._transport is not None:
return self._transport.get_extra_info(name, default)
+ else:
+ return default
def _start_shutdown(self):
if self._in_shutdown: