Skip to content

Commit de27a57

Browse files
authored
Merge pull request #2322 from GNS3/release-v2.2.44.1
Release v2.2.44.1
2 parents 46d9ada + c88f76b commit de27a57

File tree

5 files changed

+22
-7
lines changed

5 files changed

+22
-7
lines changed

CHANGELOG

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Change Log
22

3+
## 2.2.44.1 07/11/2023
4+
5+
* Catch exceptions when computing image checksums. Ref https://github.com/GNS3/gns3-server/issues/2228
6+
* Add freeze_support() for multiprocessing
7+
38
## 2.2.44 06/11/2023
49

510
* Bundle web-ui v2.2.44

gns3server/crash_report.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class CrashReport:
5757
Report crash to a third party service
5858
"""
5959

60-
DSN = "https://dcbac52ef824b8386b67cc8f07c4de70@o19455.ingest.sentry.io/38482"
60+
DSN = "https://eb1150edfa1530053154ff1fcb67afd1@o19455.ingest.sentry.io/38482"
6161
_instance = None
6262

6363
def __init__(self):

gns3server/main.py

+4
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import os
3232
import sys
3333
import types
34+
import multiprocessing
3435

3536
# To avoid strange bug later we switch the event loop before any other operation
3637
if sys.platform.startswith("win"):
@@ -79,6 +80,9 @@ def main():
7980
if not sys.platform.startswith("win"):
8081
if "--daemon" in sys.argv:
8182
daemonize()
83+
else:
84+
multiprocessing.freeze_support()
85+
8286
from gns3server.run import run
8387
run()
8488

gns3server/version.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
# or negative for a release candidate or beta (after the base version
2424
# number has been incremented)
2525

26-
__version__ = "2.2.44"
27-
__version_info__ = (2, 2, 44, 0)
26+
__version__ = "2.2.44.1"
27+
__version_info__ = (2, 2, 44, -99)
2828

2929
if "dev" in __version__:
3030
try:

gns3server/web/web_server.py

+10-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import time
3030
import atexit
3131
import weakref
32-
import concurrent.futures
3332

3433
# Import encoding now, to avoid implicit import later.
3534
# Implicit import within threads may cause LookupError when standard library is in a ZIP
@@ -238,11 +237,18 @@ async def _compute_image_checksums(self):
238237
Compute image checksums.
239238
"""
240239

240+
if sys.platform.startswith("darwin") and hasattr(sys, "frozen"):
241+
# do not compute on macOS because errors
242+
return
241243
loop = asyncio.get_event_loop()
244+
import concurrent.futures
242245
with concurrent.futures.ProcessPoolExecutor(max_workers=1) as pool:
243-
log.info("Computing image checksums...")
244-
await loop.run_in_executor(pool, list_images, "qemu")
245-
log.info("Finished computing image checksums")
246+
try:
247+
log.info("Computing image checksums...")
248+
await loop.run_in_executor(pool, list_images, "qemu")
249+
log.info("Finished computing image checksums")
250+
except OSError as e:
251+
log.warning("Could not compute image checksums: {}".format(e))
246252

247253
async def _on_startup(self, *args):
248254
"""

0 commit comments

Comments
 (0)