From 20e481703f86d9afda2752ee65c0945f106d49a2 Mon Sep 17 00:00:00 2001 From: Ale Vilar Date: Fri, 13 Dec 2024 13:39:47 -0300 Subject: [PATCH] Update GitHub Actions workflow to trigger on version tags, modify service file for root user/group, and enhance error logging in RabbitMQ consumer --- .github/workflows/desktop.build.yml | 7 +++++-- fiscalberry.service | 4 +++- src/common/EscPComandos.py | 2 -- src/common/rabbit_mq_consumer.py | 3 +++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/desktop.build.yml b/.github/workflows/desktop.build.yml index b735179b66..cfac27b8b9 100644 --- a/.github/workflows/desktop.build.yml +++ b/.github/workflows/desktop.build.yml @@ -1,6 +1,9 @@ -name: Build Desktop Ejecutables - on Release +name: Build Desktop Ejecutables - on New Version -on: push +on: + push: + tags: + - 'v*.*.*' jobs: build-raspberry-pi: diff --git a/fiscalberry.service b/fiscalberry.service index f385f41b88..e9da8800c1 100644 --- a/fiscalberry.service +++ b/fiscalberry.service @@ -4,11 +4,13 @@ Wants=network-online.target After=network.target network-online.target [Service] +User=root +Group=root Restart=always RestartSec=5 Type=simple ExecStart=/usr/bin/fiscalberry -StandardOutput=syslog +StandardOutput=syslogsudo systemctl restart fiscalberry.service StandardError=syslog SyslogIdentifier=fiscalberry diff --git a/src/common/EscPComandos.py b/src/common/EscPComandos.py index 422d6d0f7a..b014a8ce22 100644 --- a/src/common/EscPComandos.py +++ b/src/common/EscPComandos.py @@ -366,8 +366,6 @@ def printFacturaElectronica(self, escpos: EscposIO, **kwargs): escpos.writelines(f'{dsTotal}{self.signo}{importeTotal}', bold=True, align='left', height=2, width=2) printer.ln(); - printer.text(f'{dsSinIva}{self.signo}{importeSinIva}\n') - dsSinIva = pad("Neto sin IVA:", self.desc_cols_ext - 1, " ", "l") importeSinIva = pad(f"{round(totalNeto, 2):,.2f}",self.price_cols, " ", "r") printer.set(font='a', height=1, align='left', normal_textsize=True) diff --git a/src/common/rabbit_mq_consumer.py b/src/common/rabbit_mq_consumer.py index 21fbbcfe31..15a34de5bc 100644 --- a/src/common/rabbit_mq_consumer.py +++ b/src/common/rabbit_mq_consumer.py @@ -53,8 +53,11 @@ def callback(ch, method, properties, body): except TraductorException as e: self.logger.error(f"TraductorException Error al procesar mensaje: {e}") ch.basic_nack(delivery_tag=method.delivery_tag, requeue=True) + self.logger.error(traceback.format_exc()) + except Exception as e: self.logger.error(f"Error al procesar mensaje: {e}") + self.logger.error(traceback.format_exc()) ch.basic_nack(delivery_tag=method.delivery_tag, requeue=True)