From be5a785368a0d6e10a77e6ec155f0cabe9ca776a Mon Sep 17 00:00:00 2001 From: Peter Hormanns Date: Thu, 22 Jun 2023 22:12:06 +0200 Subject: [PATCH] some enhancements, v. 4.0.7 --- hsarback/database/dropschema.sql | 3 ++- hsarback/pom.xml | 6 +++--- qserv-deploy/pom.xml | 13 +++++++++++-- qserv-deploy/src/deb/etc/keystore | Bin 0 -> 4444 bytes qserv-deploy/src/deb/etc/logging.properties | 2 +- qserv-deploy/src/deb/etc/qserv.properties | 10 +++------- .../src/deb/systemd/hsadmin-qserv.service | 17 +++++++++++++++++ qserv/pom.xml | 4 ++-- .../de/hsadmin/core/qserv/QueueServer.java | 5 ++++- util/pom.xml | 2 +- .../main/java/de/hsadmin/core/util/Config.java | 4 ++-- 11 files changed, 46 insertions(+), 20 deletions(-) create mode 100644 qserv-deploy/src/deb/etc/keystore create mode 100644 qserv-deploy/src/deb/systemd/hsadmin-qserv.service diff --git a/hsarback/database/dropschema.sql b/hsarback/database/dropschema.sql index 1e001ee..352c2eb 100644 --- a/hsarback/database/dropschema.sql +++ b/hsarback/database/dropschema.sql @@ -1,7 +1,8 @@ DROP TABLE pricelist_ref ; DROP TABLE price ; DROP TABLE price_list CASCADE ; --- DROP VIEW business_partner_ticket ; +DROP VIEW IF EXISTS business_partner_ticket ; +DROP VIEW IF EXISTS ipconfig ; DROP TABLE sepa_mandat ; DROP SEQUENCE sepa_mandat_id_seq ; DROP SEQUENCE contact_contact_id_seq ; diff --git a/hsarback/pom.xml b/hsarback/pom.xml index 6f4ac05..eecfe62 100644 --- a/hsarback/pom.xml +++ b/hsarback/pom.xml @@ -5,7 +5,7 @@ de.hsadmin hsar war - 4.0.6 + 4.0.7 HSAdmin Stable Backend Webapp http://maven.apache.org @@ -36,12 +36,12 @@ de.hsadmin.core hsadmin-util - 4.0.6 + 4.0.7 de.hsadmin.core hsadmin-qserv - 4.0.6 + 4.0.7 commons-httpclient diff --git a/qserv-deploy/pom.xml b/qserv-deploy/pom.xml index 0182bbc..bd7efe5 100644 --- a/qserv-deploy/pom.xml +++ b/qserv-deploy/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.hsadmin hsadmin-qserv - 4.0.6 + 4.0.7 jar HSAdmin-QServ @@ -13,7 +13,7 @@ de.hsadmin.core hsadmin-qserv - 4.0.6 + 4.0.7 org.apache.activemq @@ -109,6 +109,15 @@ 640 + + src/deb/systemd/hsadmin-qserv.service + file + + perm + /lib/systemd/system/ + 644 + + diff --git a/qserv-deploy/src/deb/etc/keystore b/qserv-deploy/src/deb/etc/keystore new file mode 100644 index 0000000000000000000000000000000000000000..dff26bcf20b5faf76e3e459e9c68a687ef51975e GIT binary patch literal 4444 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 znsef85e`4.0.0 de.hsadmin.core hsadmin-qserv - 4.0.6 + 4.0.7 UTF-8 11 @@ -13,7 +13,7 @@ de.hsadmin.core hsadmin-util - 4.0.6 + 4.0.7 commons-lang diff --git a/qserv/src/main/java/de/hsadmin/core/qserv/QueueServer.java b/qserv/src/main/java/de/hsadmin/core/qserv/QueueServer.java index 76b0157..a42c69e 100644 --- a/qserv/src/main/java/de/hsadmin/core/qserv/QueueServer.java +++ b/qserv/src/main/java/de/hsadmin/core/qserv/QueueServer.java @@ -184,9 +184,12 @@ public class QueueServer extends QueueCommons implements MessageListener, Except public void onException(JMSException e) { logger.log(Level.WARNING, e.getMessage(), e); close(); + try { + Thread.sleep(10 * 1000L); + } catch (InterruptedException e1) { } while (!connect()) { try { - Thread.sleep(10000); + Thread.sleep(120 * 1000L); } catch (InterruptedException e1) { } } } diff --git a/util/pom.xml b/util/pom.xml index 69896bd..bfbe072 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.hsadmin.core hsadmin-util - 4.0.6 + 4.0.7 UTF-8 11 diff --git a/util/src/main/java/de/hsadmin/core/util/Config.java b/util/src/main/java/de/hsadmin/core/util/Config.java index 2d713a4..30e58bf 100644 --- a/util/src/main/java/de/hsadmin/core/util/Config.java +++ b/util/src/main/java/de/hsadmin/core/util/Config.java @@ -23,10 +23,10 @@ public class Config { file = new File(System.getProperty("user.home") + "/.hsadmin.properties"); } if (!file.canRead()) { - file = new File("/etc/hsadmin.properties"); + file = new File("/etc/hsadmin/hsadmin.properties"); } if (!file.canRead()) { - file = new File("/etc/hsadmin/hsadmin.properties"); + file = new File("/etc/hsadmin.properties"); } if (file.canRead()) { try {