aggiunte altre cose

master
Emanuele Trabattoni 2020-03-19 15:41:30 +01:00
parent ee4fecc893
commit 02de8f3c2f
3 changed files with 33 additions and 7 deletions

View File

@ -1,6 +1,9 @@
import requests import requests
import time import time
URL_ERR = 'tscprinter/errore/'
URL_EVENT = 'tscprinter/evento/'
def notifier(django_addr, queue_out, logger): def notifier(django_addr, queue_out, logger):
logger.warning("Notifier started") logger.warning("Notifier started")
while True: while True:

View File

@ -10,8 +10,7 @@ import threading, sys, queue, logging
from driver.tsc_printer import tsc_printer from driver.tsc_printer import tsc_printer
Q_TIMEOUT = 2 Q_TIMEOUT = 2
URL_ERR = 'tscprinter/errore/'
URL_EVENT = 'tscprinter/evento/'
#lancia i thread, uno per stampante #lancia i thread, uno per stampante
def main(q_in :queue.Queue, q_out :queue.Queue, q_comm: queue.Queue, logger: logging.getLogger): def main(q_in :queue.Queue, q_out :queue.Queue, q_comm: queue.Queue, logger: logging.getLogger):

View File

@ -9,18 +9,33 @@ import queue, sys, time, socket, logging
SOCK_TIMEOUT = 2 SOCK_TIMEOUT = 2
def tsc_printer(q_in: queue.Queue, q_out: queue.Queue, q_cmd: queue.Queue, ip: str, port: int, logger: logging.getLogger): def tsc_printer(q_in: queue.Queue, q_out: queue.Queue, q_cmd: queue.Queue, ip: str, port: int, logger: logging.getLogger):
prt = None
def lista_file():
nonlocal prt
pass
def invia_file(name=None, content=None):
nonlocal prt
pass
def elimina_file(name=None):
nonlocal prt
def riconnetti_socket():
pass pass
def invia_file(): def muovi_file(name=None):
#per default muove i file dalla RAM alla FLASH
nonlocal prt
pass pass
def elimina_file(): def esegui(name=None):
nonlocal prt
pass pass
def muovi_file(): def stato():
pass nonlocal prt
return sts
while True: # connetti mantieni vivo il socket while True: # connetti mantieni vivo il socket
try: try:
@ -28,15 +43,20 @@ def tsc_printer(q_in: queue.Queue, q_out: queue.Queue, q_cmd: queue.Queue, ip: s
prt.create_connection(address=(ip, port), timeout=SOCK_TIMEOUT) prt.create_connection(address=(ip, port), timeout=SOCK_TIMEOUT)
while True: while True:
itm = q_in.get(block=True) itm = q_in.get(block=True)
prt_cmd = ""
cmd = itm['name'] cmd = itm['name']
par = itm['parameters'] par = itm['parameters']
if cmd == 'DOWNLOAD': if cmd == 'DOWNLOAD':
invia_file(par['name'], par['lines'])
pass pass
elif cmd == 'REMOVE': elif cmd == 'REMOVE':
elimina_file(par['name'])
pass pass
elif cmd == 'MOVE': elif cmd == 'MOVE':
muovi_file(par['name'])
pass pass
elif cmd == 'LIST': elif cmd == 'LIST':
q_out.put({'url='})
pass pass
elif cmd == 'RUN': elif cmd == 'RUN':
pass pass
@ -46,6 +66,10 @@ def tsc_printer(q_in: queue.Queue, q_out: queue.Queue, q_cmd: queue.Queue, ip: s
logger.error(f"Stampante {__name__} irraggiungibile:{st}") logger.error(f"Stampante {__name__} irraggiungibile:{st}")
prt.close() prt.close()
del prt del prt
except socket.error as se:
logger.error(f"Errore generico stamoante {__name__}: {se}")
prt.close()
del prt
except Exception as e: except Exception as e:
logger.error("Errore generale inizializzando la stampante: {}".format(e)) logger.error("Errore generale inizializzando la stampante: {}".format(e))