mirror of https://github.com/borgbackup/borg.git
display msgpack version as part of sysinfo (e.g. in tracebacks)
This commit is contained in:
parent
764d2d824e
commit
f541d6e689
|
@ -13,6 +13,7 @@ from ..logger import create_logger
|
||||||
logger = create_logger()
|
logger = create_logger()
|
||||||
|
|
||||||
from .time import to_localtime
|
from .time import to_localtime
|
||||||
|
from . import msgpack
|
||||||
from .. import __version__ as borg_version
|
from .. import __version__ as borg_version
|
||||||
from .. import chunker
|
from .. import chunker
|
||||||
|
|
||||||
|
@ -81,12 +82,17 @@ def sysinfo():
|
||||||
linux_distribution = ('Unknown Linux', '', '')
|
linux_distribution = ('Unknown Linux', '', '')
|
||||||
else:
|
else:
|
||||||
linux_distribution = None
|
linux_distribution = None
|
||||||
|
try:
|
||||||
|
msgpack_version = '.'.join(str(v) for v in msgpack.version)
|
||||||
|
except:
|
||||||
|
msgpack_version = 'unknown'
|
||||||
info = []
|
info = []
|
||||||
if uname is not None:
|
if uname is not None:
|
||||||
info.append('Platform: %s' % (' '.join(uname), ))
|
info.append('Platform: %s' % (' '.join(uname), ))
|
||||||
if linux_distribution is not None:
|
if linux_distribution is not None:
|
||||||
info.append('Linux: %s %s %s' % linux_distribution)
|
info.append('Linux: %s %s %s' % linux_distribution)
|
||||||
info.append('Borg: %s Python: %s %s' % (borg_version, python_implementation, python_version))
|
info.append('Borg: %s Python: %s %s msgpack: %s' % (
|
||||||
|
borg_version, python_implementation, python_version, msgpack_version))
|
||||||
info.append('PID: %d CWD: %s' % (os.getpid(), os.getcwd()))
|
info.append('PID: %d CWD: %s' % (os.getpid(), os.getcwd()))
|
||||||
info.append('sys.argv: %r' % sys.argv)
|
info.append('sys.argv: %r' % sys.argv)
|
||||||
info.append('SSH_ORIGINAL_COMMAND: %r' % os.environ.get('SSH_ORIGINAL_COMMAND'))
|
info.append('SSH_ORIGINAL_COMMAND: %r' % os.environ.get('SSH_ORIGINAL_COMMAND'))
|
||||||
|
|
|
@ -24,11 +24,15 @@ from msgpack import pack as mp_pack
|
||||||
from msgpack import Unpacker as mp_Unpacker
|
from msgpack import Unpacker as mp_Unpacker
|
||||||
from msgpack import unpackb as mp_unpackb
|
from msgpack import unpackb as mp_unpackb
|
||||||
from msgpack import unpack as mp_unpack
|
from msgpack import unpack as mp_unpack
|
||||||
|
from msgpack import version as mp_version
|
||||||
|
|
||||||
from msgpack import ExtType
|
from msgpack import ExtType
|
||||||
from msgpack import OutOfData
|
from msgpack import OutOfData
|
||||||
|
|
||||||
|
|
||||||
|
version = mp_version
|
||||||
|
|
||||||
|
|
||||||
class PackException(Exception):
|
class PackException(Exception):
|
||||||
"""Exception while msgpack packing"""
|
"""Exception while msgpack packing"""
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue