Emanuele
/
driver_tsc
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

corretti errori e debug

master
Emanuele Trabattoni 2020-03-20 11:58:16 +01:00
parent d57327cb4a
commit c168a8df07
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
driver/main.py
View File

@ -22,10 +22,12 @@ app = Flask(__name__)
@app.route('/tscprinter/printer/<ip>/<command>', methods=['POST']) @app.route('/tscprinter/printer/<ip>/<command>', methods=['POST'])
def printer_in(ip, command): def printer_in(ip, command):
parameters = request.get_json() parameters = request.get_json()
print(f"Comando Stampante: {ip} {command} {str(parameters)}")
# questo prossimo mi sa che non funzia perché la funzione # questo prossimo mi sa che non funzia perché la funzione
# inizia a esistere quando si esegue tsc_manager.main ma poi non # inizia a esistere quando si esegue tsc_manager.main ma poi non
# viene esportata nello scope del modulo tsc_manager # viene esportata nello scope del modulo tsc_manager
queue_id = tsc_manager.get_queue_id(ip) queue_id = tsc_manager.get_queue_id(ip)
print(queue_id)
if queue_id is not None and queue_id in queues_in: if queue_id is not None and queue_id in queues_in:
queues_in[queue_id].put({'name': command, 'parameters': parameters}) queues_in[queue_id].put({'name': command, 'parameters': parameters})
return "Comando Stampante Inviato", 200 return "Comando Stampante Inviato", 200
@ -35,6 +37,7 @@ def printer_in(ip, command):
@app.route('/tscprinter/gest/<command>', methods=['POST']) @app.route('/tscprinter/gest/<command>', methods=['POST'])
def gest_in(command): def gest_in(command):
parameters = request.get_json() parameters = request.get_json()
print(f"Comando Gestore: {str(parameters)}")
# istes di sopra # istes di sopra
queue_command = tsc_manager.get_queue_command() queue_command = tsc_manager.get_queue_command()
if queue_command is not None: if queue_command is not None:
@ -80,4 +83,6 @@ if __name__ == '__main__':
# dico (aspettando) a django che siamo pronti a ricevere gli indirizzi # dico (aspettando) a django che siamo pronti a ricevere gli indirizzi
# delle stampanti # delle stampanti
notifier.send_hello(queue_out) notifier.send_hello(queue_out)
serve(app, listen=listen) serve(app, listen=listen)

8
driver/tsc_manager.py
View File

@ -28,18 +28,20 @@ def get_queue_command():
#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):
global printer_map global printer_map
logger.info("Acceso manager")
printer_map['queue_command'] = q_comm
while True: while True:
try: try:
comando = q_comm.get(block=True, timeout=Q_TIMEOUT) comando = q_comm.get(block=True)
cmd = comando['name'] cmd = comando['name']
par = comando['parameters'] par = comando['parameters']
logger.info(f"Arrivato comando {cmd}")
if cmd == "CONNETTI": if cmd == "CONNETTI":
logger.info(f"Connetto a {par['ip']}:{par['port']}")
printer_map[par['ip']] = {} printer_map[par['ip']] = {}
# genera nuove code in ingresso per la nuova stampante # genera nuove code in ingresso per la nuova stampante
q_in_prt = queue.Queue() q_in_prt = queue.Queue()
q_cmd_prt = queue.Queue() q_cmd_prt = queue.Queue()
printer_map['queue_command'] = q_comm
printer_map[par['ip']]['queue_id'] = q_in_prt # aggiungi la nuova coda al dict delle code printer_map[par['ip']]['queue_id'] = q_in_prt # aggiungi la nuova coda al dict delle code
printer_map[par['ip']]['port'] = par['port'] printer_map[par['ip']]['port'] = par['port']
# lancia un thread stampante con la nuova coda ingresso # lancia un thread stampante con la nuova coda ingresso

2
driver/tsc_printer.py
View File

@ -75,7 +75,7 @@ def tsc_printer(q_in: queue.Queue, q_out: queue.Queue, q_cmd: queue.Queue, ip: s
while True: # connetti mantieni vivo il socket while True: # connetti mantieni vivo il socket
try: try:
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as prt: with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as prt:
prt.create_connection(address=(ip, port), timeout=SOCK_TIMEOUT) prt.connect((ip, port))
while True: while True:
itm = q_in.get(block=True) itm = q_in.get(block=True)
cmd = itm['name'] cmd = itm['name']