summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Fankhauser hiddenalpha.ch2024-03-08 19:26:40 +0100
committerAndreas Fankhauser hiddenalpha.ch2024-03-08 19:26:40 +0100
commit54fa9f28e2dfe05ef8b960c45233a44e3415e0ee (patch)
tree65dca58dd806bafc94e5196d20c87f37b38d955e
parenteebaf983bb03763e2091cc3524e235aea8d75710 (diff)
downloadUnspecifiedGarbage-54fa9f28e2dfe05ef8b960c45233a44e3415e0ee.zip
UnspecifiedGarbage-54fa9f28e2dfe05ef8b960c45233a44e3415e0ee.tar.gz
Dump some changes
-rw-r--r--doc/note/openshift/openshift.txt2
-rw-r--r--src/main/java/ch/hiddenalpha/unspecifiedgarbage/time/TimeUtils.java6
-rw-r--r--src/main/patch/houston/default-20230203.patch52
-rw-r--r--src/main/patch/houston/default-20230214.patch56
-rw-r--r--src/main/patch/houston/default-20230331.patch56
5 files changed, 4 insertions, 168 deletions
diff --git a/doc/note/openshift/openshift.txt b/doc/note/openshift/openshift.txt
index 48fda8f..88e33ee 100644
--- a/doc/note/openshift/openshift.txt
+++ b/doc/note/openshift/openshift.txt
@@ -77,7 +77,7 @@ HINT: ALL files from Current dir (.) will get uploaded (when global rsync not av
## up/down scale from cli. input von thom (20230815)
- oc scale dc/preflux --replicas=1
+ oc scale dc/${SVCNAME:?} --replicas=1
diff --git a/src/main/java/ch/hiddenalpha/unspecifiedgarbage/time/TimeUtils.java b/src/main/java/ch/hiddenalpha/unspecifiedgarbage/time/TimeUtils.java
index 2bb1bfb..d7d7ec8 100644
--- a/src/main/java/ch/hiddenalpha/unspecifiedgarbage/time/TimeUtils.java
+++ b/src/main/java/ch/hiddenalpha/unspecifiedgarbage/time/TimeUtils.java
@@ -25,9 +25,9 @@ public class TimeUtils {
* Find smallest distance assuming integers overflow "like a circle".
*
* Computers cannot represent all existing integers. Due to how
- * integers are represented in computers, they are not infinite but
- * more like a circle. Speak when we infinitely increment an
- * integer, it overflows and (usually) continues to walk around this
+ * integers are represented in java, they are not infinite but
+ * more like a circle. Speak when we infinitely increment an integer,
+ * it overflows and (usually) continues to walk around this
* (imaginary) circle.
*
* This function takes two of those numbers on this circle and
diff --git a/src/main/patch/houston/default-20230203.patch b/src/main/patch/houston/default-20230203.patch
deleted file mode 100644
index c1deeca..0000000
--- a/src/main/patch/houston/default-20230203.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-
- My custom patch ready-to-apply to have an "usable" houston.
-
- Contains:
- - Simplelogger
- - Listen localhost only
- - Queue-Retry every 5 seconds.
-
-diff --git a/houston-process/pom.xml b/houston-process/pom.xml
-index fff9c178..960c0098 100644
---- a/houston-process/pom.xml
-+++ b/houston-process/pom.xml
-@@ -20,6 +20,26 @@
- <skip.node.install>true</skip.node.install>
- </properties>
- <dependencies>
-+ <dependency> <!-- TODO: Remove -->
-+ <groupId>org.slf4j</groupId> <!-- TODO: Remove -->
-+ <artifactId>slf4j-api</artifactId> <!-- TODO: Remove -->
-+ <version>1.7.25</version> <!-- TODO: Remove -->
-+ </dependency> <!-- TODO: Remove -->
-+ <dependency> <!-- TODO: Remove -->
-+ <groupId>org.slf4j</groupId> <!-- TODO: Remove -->
-+ <artifactId>slf4j-simple</artifactId> <!-- TODO: Remove -->
-+ <version>1.7.25</version> <!-- TODO: Remove -->
-+ </dependency> <!-- TODO: Remove -->
-+ <dependency> <!-- TODO: Remove -->
-+ <groupId>org.slf4j</groupId> <!-- TODO: Remove -->
-+ <artifactId>jcl-over-slf4j</artifactId> <!-- TODO: Remove -->
-+ <version>1.7.25</version> <!-- TODO: Remove -->
-+ </dependency> <!-- TODO: Remove -->
-+ <dependency> <!-- TODO: Remove -->
-+ <groupId>org.slf4j</groupId> <!-- TODO: Remove -->
-+ <artifactId>jul-to-slf4j</artifactId> <!-- TODO: Remove -->
-+ <version>1.7.25</version> <!-- TODO: Remove -->
-+ </dependency> <!-- TODO: Remove -->
- <!-- project -->
- <dependency>
- <groupId>ch.post.it.paisa.houston</groupId>
-diff --git a/houston-process/src/main/java/ch/post/it/paisa/houston/process/main/Deployer.java b/houston-process/src/main/java/ch/post/it/paisa/houston/process/main/Deployer.java
-index ee7d8b02..b28ae8d6 100644
---- a/houston-process/src/main/java/ch/post/it/paisa/houston/process/main/Deployer.java
-+++ b/houston-process/src/main/java/ch/post/it/paisa/houston/process/main/Deployer.java
-@@ -256,7 +256,7 @@ public class Deployer {
- qc.add(new QueueConfiguration().withPattern("brox-from-vehicles-.*").withRetryIntervals(10, 20, 30, 60, 120)
- .withEnqueueDelayMillisPerSize(10).withEnqueueMaxDelayMillis(10_000));
- // All other queues (typically to backend services) with a slow-down pattern after failed delivery
-- qc.add(new QueueConfiguration().withPattern(".*").withRetryIntervals(10, 20, 30, 60, 120));
-+ qc.add(new QueueConfiguration().withPattern(".*").withRetryIntervals(5));/*TODO revert*/
-
- RedisquesConfiguration redisquesConfig = RedisquesConfiguration.with()
- .address(Address.redisquesAddress())
diff --git a/src/main/patch/houston/default-20230214.patch b/src/main/patch/houston/default-20230214.patch
deleted file mode 100644
index 3f8fa16..0000000
--- a/src/main/patch/houston/default-20230214.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-
- My custom patch ready-to-apply to have an "usable" houston.
-
- Contains:
- - Simplelogger
- - Listen localhost only
- - Queue-Retry every 5 seconds.
-
- Patch based on "houston-02.01.12.00" aka
- "3c61ef7ded53d6340001d2b56cd829d2ae450580" from 2023-01-12.
-
-diff --git a/houston-process/pom.xml b/houston-process/pom.xml
-index fff9c178..960c0098 100644
---- a/houston-process/pom.xml
-+++ b/houston-process/pom.xml
-@@ -20,6 +20,26 @@
- </properties>
-
- <dependencies>
-+ <dependency> <!-- TODO: Remove -->
-+ <groupId>org.slf4j</groupId> <!-- TODO: Remove -->
-+ <artifactId>slf4j-api</artifactId> <!-- TODO: Remove -->
-+ <version>1.7.25</version> <!-- TODO: Remove -->
-+ </dependency> <!-- TODO: Remove -->
-+ <dependency> <!-- TODO: Remove -->
-+ <groupId>org.slf4j</groupId> <!-- TODO: Remove -->
-+ <artifactId>slf4j-simple</artifactId> <!-- TODO: Remove -->
-+ <version>1.7.25</version> <!-- TODO: Remove -->
-+ </dependency> <!-- TODO: Remove -->
-+ <dependency> <!-- TODO: Remove -->
-+ <groupId>org.slf4j</groupId> <!-- TODO: Remove -->
-+ <artifactId>jcl-over-slf4j</artifactId> <!-- TODO: Remove -->
-+ <version>1.7.25</version> <!-- TODO: Remove -->
-+ </dependency> <!-- TODO: Remove -->
-+ <dependency> <!-- TODO: Remove -->
-+ <groupId>org.slf4j</groupId> <!-- TODO: Remove -->
-+ <artifactId>jul-to-slf4j</artifactId> <!-- TODO: Remove -->
-+ <version>1.7.25</version> <!-- TODO: Remove -->
-+ </dependency> <!-- TODO: Remove -->
- <!-- project -->
- <dependency>
- <groupId>ch.post.it.paisa.houston</groupId>
-diff --git a/houston-process/src/main/java/ch/post/it/paisa/houston/process/main/Deployer.java b/houston-process/src/main/java/ch/post/it/paisa/houston/process/main/Deployer.java
-index ee7d8b02..b28ae8d6 100644
---- a/houston-process/src/main/java/ch/post/it/paisa/houston/process/main/Deployer.java
-+++ b/houston-process/src/main/java/ch/post/it/paisa/houston/process/main/Deployer.java
-@@ -309,7 +309,7 @@ public class Deployer {
- qc.add(new QueueConfiguration().withPattern("timetable-situation-trips-for-aws").withRetryIntervals(standardDelays)
- .withEnqueueDelayMillisPerSize(10).withEnqueueMaxDelayMillis(100));
- // All other queues (typically to backend services) with a slow-down pattern after failed delivery
-- qc.add(new QueueConfiguration().withPattern(".*").withRetryIntervals(standardDelays));
-+ qc.add(new QueueConfiguration().withPattern(".*").withRetryIntervals(5/*TODO revert*/));
-
- RedisquesConfiguration redisquesConfig = RedisquesConfiguration.with()
- .address(Address.redisquesAddress())
-
diff --git a/src/main/patch/houston/default-20230331.patch b/src/main/patch/houston/default-20230331.patch
deleted file mode 100644
index 64d3628..0000000
--- a/src/main/patch/houston/default-20230331.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-
- My custom patch ready-to-apply to have an "usable" houston.
-
- Contains:
- - Simplelogger
- - Listen localhost only
- - Queue-Retry every 5 seconds.
-
- Patch based on "houston-02.01.12.00" aka
- "3c61ef7ded53d6340001d2b56cd829d2ae450580" from 2023-01-12.
-
-diff --git a/houston-process/pom.xml b/houston-process/pom.xml
-index fff9c178..960c0098 100644
---- a/houston-process/pom.xml
-+++ b/houston-process/pom.xml
-@@ -20,6 +20,26 @@
- </properties>
-
- <dependencies>
-+ <dependency> <!-- TODO: Remove -->
-+ <groupId>org.slf4j</groupId> <!-- TODO: Remove -->
-+ <artifactId>slf4j-api</artifactId> <!-- TODO: Remove -->
-+ <version>2.0.1</version> <!-- TODO: Remove -->
-+ </dependency> <!-- TODO: Remove -->
-+ <dependency> <!-- TODO: Remove -->
-+ <groupId>org.slf4j</groupId> <!-- TODO: Remove -->
-+ <artifactId>slf4j-simple</artifactId> <!-- TODO: Remove -->
-+ <version>2.0.1</version> <!-- TODO: Remove -->
-+ </dependency> <!-- TODO: Remove -->
-+ <dependency> <!-- TODO: Remove -->
-+ <groupId>org.slf4j</groupId> <!-- TODO: Remove -->
-+ <artifactId>jcl-over-slf4j</artifactId> <!-- TODO: Remove -->
-+ <version>2.0.1</version> <!-- TODO: Remove -->
-+ </dependency> <!-- TODO: Remove -->
-+ <dependency> <!-- TODO: Remove -->
-+ <groupId>org.slf4j</groupId> <!-- TODO: Remove -->
-+ <artifactId>jul-to-slf4j</artifactId> <!-- TODO: Remove -->
-+ <version>2.0.1</version> <!-- TODO: Remove -->
-+ </dependency> <!-- TODO: Remove -->
- <!-- project -->
- <dependency>
- <groupId>ch.post.it.paisa.houston</groupId>
-diff --git a/houston-process/src/main/java/ch/post/it/paisa/houston/process/main/Deployer.java b/houston-process/src/main/java/ch/post/it/paisa/houston/process/main/Deployer.java
-index ee7d8b02..b28ae8d6 100644
---- a/houston-process/src/main/java/ch/post/it/paisa/houston/process/main/Deployer.java
-+++ b/houston-process/src/main/java/ch/post/it/paisa/houston/process/main/Deployer.java
-@@ -309,7 +309,7 @@ public class Deployer {
- qc.add(new QueueConfiguration().withPattern("timetable-situation-trips-for-aws").withRetryIntervals(standardDelays)
- .withEnqueueDelayMillisPerSize(10).withEnqueueMaxDelayMillis(100));
- // All other queues (typically to backend services) with a slow-down pattern after failed delivery
-- qc.add(new QueueConfiguration().withPattern(".*").withRetryIntervals(standardDelays));
-+ qc.add(new QueueConfiguration().withPattern(".*").withRetryIntervals(5/*TODO revert*/));
-
- RedisquesConfiguration redisquesConfig = RedisquesConfiguration.with()
- .address(Address.redisquesAddress())
-