Revert "server: watch for dangling python processes"

This reverts commit b29f2d5ee1.
This commit is contained in:
Koushik Dutta
2023-04-14 13:02:51 -07:00
parent b29f2d5ee1
commit 493f8deeef
3 changed files with 4 additions and 12 deletions

View File

@@ -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",

View File

@@ -1,6 +1,6 @@
{
"name": "@scrypted/server",
"version": "0.7.62",
"version": "0.7.61",
"description": "",
"dependencies": {
"@mapbox/node-pre-gyp": "^1.0.10",

View File

@@ -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()