diff --git a/server/package-lock.json b/server/package-lock.json index 1b4d38292..8b8bd5019 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/server", - "version": "0.7.62", + "version": "0.7.61", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@scrypted/server", - "version": "0.7.62", + "version": "0.7.61", "license": "ISC", "dependencies": { "@mapbox/node-pre-gyp": "^1.0.10", diff --git a/server/package.json b/server/package.json index 7eafb8897..6f46357d4 100644 --- a/server/package.json +++ b/server/package.json @@ -1,6 +1,6 @@ { "name": "@scrypted/server", - "version": "0.7.62", + "version": "0.7.61", "description": "", "dependencies": { "@mapbox/node-pre-gyp": "^1.0.10", diff --git a/server/python/plugin_remote.py b/server/python/plugin_remote.py index 461dc49e9..3cf8013ee 100644 --- a/server/python/plugin_remote.py +++ b/server/python/plugin_remote.py @@ -506,14 +506,9 @@ class PluginRemote: print('new fork') pluginFork.worker = multiprocessing.Process(target=plugin_fork, args=(child_conn,), daemon=True) pluginFork.worker.start() - lastUpdate = time.time() def schedule_exit_check(): def exit_check(): - if time.time() - lastUpdate() > 60: - print('fork worker is unresponsive, terminating') - pluginFork.worker.kill() - if pluginFork.worker.exitcode != None: pluginFork.worker.join() else: @@ -528,8 +523,6 @@ class PluginRemote: forkPeer.peerName = 'thread' async def updateStats(stats): - nonlocal lastUpdate - lastUpdate = time.time() self.ptimeSum += stats['cpu']['user'] self.allMemoryStats[forkPeer] = stats forkPeer.params['updateStats'] = updateStats @@ -539,9 +532,8 @@ class PluginRemote: await readLoop() except: # traceback.print_exc() - pass - finally: print('fork read loop exited') + finally: self.allMemoryStats.pop(forkPeer) parent_conn.close() rpcTransport.executor.shutdown()