@scrypted/server 0.7.62 → 0.7.63
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of @scrypted/server might be problematic. Click here for more details.
- package/package.json +1 -1
- package/python/plugin_remote.py +1 -9
package/package.json
CHANGED
package/python/plugin_remote.py
CHANGED
|
@@ -506,14 +506,9 @@ class PluginRemote:
|
|
|
506
506
|
print('new fork')
|
|
507
507
|
pluginFork.worker = multiprocessing.Process(target=plugin_fork, args=(child_conn,), daemon=True)
|
|
508
508
|
pluginFork.worker.start()
|
|
509
|
-
lastUpdate = time.time()
|
|
510
509
|
|
|
511
510
|
def schedule_exit_check():
|
|
512
511
|
def exit_check():
|
|
513
|
-
if time.time() - lastUpdate() > 60:
|
|
514
|
-
print('fork worker is unresponsive, terminating')
|
|
515
|
-
pluginFork.worker.kill()
|
|
516
|
-
|
|
517
512
|
if pluginFork.worker.exitcode != None:
|
|
518
513
|
pluginFork.worker.join()
|
|
519
514
|
else:
|
|
@@ -528,8 +523,6 @@ class PluginRemote:
|
|
|
528
523
|
forkPeer.peerName = 'thread'
|
|
529
524
|
|
|
530
525
|
async def updateStats(stats):
|
|
531
|
-
nonlocal lastUpdate
|
|
532
|
-
lastUpdate = time.time()
|
|
533
526
|
self.ptimeSum += stats['cpu']['user']
|
|
534
527
|
self.allMemoryStats[forkPeer] = stats
|
|
535
528
|
forkPeer.params['updateStats'] = updateStats
|
|
@@ -539,9 +532,8 @@ class PluginRemote:
|
|
|
539
532
|
await readLoop()
|
|
540
533
|
except:
|
|
541
534
|
# traceback.print_exc()
|
|
542
|
-
pass
|
|
543
|
-
finally:
|
|
544
535
|
print('fork read loop exited')
|
|
536
|
+
finally:
|
|
545
537
|
self.allMemoryStats.pop(forkPeer)
|
|
546
538
|
parent_conn.close()
|
|
547
539
|
rpcTransport.executor.shutdown()
|