audrius/stock-logistics-warehouse
1
0
Fork 1
mirror of https://github.com/OCA/stock-logistics-warehouse.git synced 2025-01-21 14:27:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] stock_vertical_lift_kardex proxy

Browse Source 
The proxy would not exit properly in case of a lost connection with the JMIF server.
The change allows the proxy to exit, giving a chance to an external monitoring system
to restart the service.
This commit is contained in:
Alexandre Fayolle
2020-11-16 09:59:25 +01:00
committed by Hai Lang
parent 125f8139bd
commit d4ef72c150
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
stock_vertical_lift_kardex/proxy/README.rst
View File

@@ -1 +1,7 @@
Kardex device proxy. Kardex device proxy.
This is meant to run as a proxy between odoo and the JMIF server
Using a proxy is required to make the synchronous JMIF protocol asynchronous for Odoo, by using ping backs.
The proxy requires python >= 3.7.

19
stock_vertical_lift_kardex/proxy/kardex-proxy.py
View File

@@ -4,6 +4,7 @@ import asyncio
import logging import logging
import os import os
import ssl import ssl
import sys
import time import time
import aiohttp # pylint: disable=missing-manifest-dependency import aiohttp # pylint: disable=missing-manifest-dependency
@@ -68,7 +69,7 @@ class KardexClientProtocol(asyncio.Protocol):
t = int(time.time()) t = int(time.time())
msg = "61|ping%d|SH1-1|0|0||||||||\r\n" % t msg = "61|ping%d|SH1-1|0|0||||||||\r\n" % t
await self.send_message(msg) await self.send_message(msg)
await asyncio.sleep(20) await asyncio.sleep(60)
async def send_message(self, message): async def send_message(self, message):
_logger.info("SEND %r", message) _logger.info("SEND %r", message)
@@ -95,6 +96,7 @@ class KardexClientProtocol(asyncio.Protocol):
self.loop.create_task(self.notify_odoo(msg)) self.loop.create_task(self.notify_odoo(msg))
def connection_lost(self, exc): def connection_lost(self, exc):
_logger.error("Connection lost: %s", exc)
self.loop.stop() self.loop.stop()
async def notify_odoo(self, msg): async def notify_odoo(self, msg):
@@ -103,7 +105,7 @@ class KardexClientProtocol(asyncio.Protocol):
params = {"answer": msg, "secret": self.args.secret} params = {"answer": msg, "secret": self.args.secret}
async with session.post(url, data=params) as resp: async with session.post(url, data=params) as resp:
resp_text = await resp.text() resp_text = await resp.text()
_logger.info("Reponse from Odoo: %s %s", resp.status, resp_text) _logger.info("Response from Odoo: %s %s", resp.status, resp_text)
def main(args, ssl_context=None): def main(args, ssl_context=None):
@@ -114,7 +116,7 @@ def main(args, ssl_context=None):
queue = asyncio.Queue(loop=loop) queue = asyncio.Queue(loop=loop)
# create the main server # create the main server
coro = loop.create_server( coro = loop.create_server(
lambda: KardexProxyProtocol(loop, queue, args), host=args.host, port=args.port lambda: KardexProxyProtocol(loop, queue, args), host=args.host, port=args.port,
) )
loop.run_until_complete(coro) loop.run_until_complete(coro)
@@ -133,8 +135,12 @@ def main(args, ssl_context=None):
transport, client = loop.run_until_complete(coro) transport, client = loop.run_until_complete(coro)
loop.create_task(client.keepalive()) loop.create_task(client.keepalive())
loop.create_task(client.process_queue()) loop.create_task(client.process_queue())
loop.run_forever() try:
loop.close() loop.run_forever()
finally:
loop.run_until_complete(loop.shutdown_asyncgens())
loop.close()
return 0
def make_parser(): def make_parser():
@@ -169,4 +175,5 @@ def make_parser():
if __name__ == "__main__": if __name__ == "__main__":
parser = make_parser() parser = make_parser()
args = parser.parse_args() args = parser.parse_args()
main(args) res = main(args)
sys.exit(res)