Browse Source

platform.platform() is not available on all platforms

Closes #1893
pull/1896/head
Safihre 4 years ago
parent
commit
990c0e07cf
  1. 12
      SABnzbd.py
  2. 8
      sabnzbd/utils/getperformance.py

12
SABnzbd.py

@ -1169,12 +1169,18 @@ def main():
except:
pass
logging.info("Commit = %s", sabnzbd.__baseline__)
logging.info("Full executable path = %s", sabnzbd.MY_FULLNAME)
logging.info("Platform = %s - %s", os.name, platform.platform())
logging.info("CPU architecture = %s", cpu_architecture)
logging.info("Python-version = %s", sys.version)
logging.info("Arguments = %s", sabnzbd.CMDLINE)
logging.info("Python-version = %s", sys.version)
logging.info("Dockerized = %s", sabnzbd.DOCKER)
logging.info("CPU architecture = %s", cpu_architecture)
try:
logging.info("Platform = %s - %s", os.name, platform.platform())
except:
# Can fail on special platforms (like Snapcraft or embedded)
pass
# Find encoding; relevant for external processing activities
logging.info("Preferred encoding = %s", sabnzbd.encoding.CODEPAGE)

8
sabnzbd/utils/getperformance.py

@ -38,8 +38,12 @@ def getcpu():
# OK, found. Remove unwanted spaces:
cputype = " ".join(cputype.split())
else:
# Not found, so let's fall back to platform()
cputype = platform.platform()
try:
# Not found, so let's fall back to platform()
cputype = platform.platform()
except:
# Can fail on special platforms (like Snapcraft or embedded)
pass
return cputype

Loading…
Cancel
Save