Continue PaisaNoSlim. Enhance LogDig resilience.

5 files changed, 114 insertions, 10 deletions

diff --git a/src/main/lua/paisa-logs/DigHoustonLogs.lua b/src/main/lua/paisa-logs/DigHoustonLogs.lua
index 1bc8dbf..74be98a 100644
--- a/src/main/lua/paisa-logs/DigHoustonLogs.lua
+++ b/src/main/lua/paisa-logs/DigHoustonLogs.lua
@@ -40,8 +40,8 @@ function loadFilters( that )
 --        { action = "drop", afterDate  = "2024-01-31 23:59:59.999", },
 
 
-        -- { action = "keep", level = "WARN", file = "BlockedThreadChecker",
-        --     msgPattern = " blocked for %d%d%d+", stackPattern = "%.twimba%." },
+        -- { action = "keep",
+        --     msgPattern = "Connection ", stackPattern = "Connection " },
         -- { action = "drop" },
 
         { action = "drop", level = "TRACE" },
diff --git a/src/main/lua/paisa-logs/PaisaLogParser.lua b/src/main/lua/paisa-logs/PaisaLogParser.lua
index f6ac0ce..fc4faa4 100644
--- a/src/main/lua/paisa-logs/PaisaLogParser.lua
+++ b/src/main/lua/paisa-logs/PaisaLogParser.lua
@@ -64,18 +64,26 @@ end
 
 
 function LogParse:tryParseLogs()
+    self.numBrokenLogLines = 0
+    self.thisEntryIsBroken = false
     while true do
         self.line = io.read("l");
-        if self.line==nil then -- EOF
-            self:publishLogEntry();
+        if self.line == nil then -- EOF
+            self:publishLogEntry()
             break;
         end
 
         --io.write( "\nBUF: ", self.line, "\n\n" );
         --io.flush()
 
-        if self.line:match("%d%d%d%d%-%d%d%-%d%d[ T]%d%d:%d%d:%d%d,%d%d%d ") then
+        if self.line:match("^%d%d%d%d%-%d%d%-%d%d[ T]%d%d:%d%d:%d%d,%d%d%d ") then
             -- Looks like the beginning of a new log entry.
+            self.thisEntryIsBroken = false
+            self:initLogEntryFromLine();
+        elseif self.line:match("^%d%d:%d%d:%d%d[,.]%d%d%d %[") then
+            -- FUCK THIS SHIT!!
+            self.thisEntryIsBroken = true
+            self.numBrokenLogLines = self.numBrokenLogLines + 1
             self:initLogEntryFromLine();
         elseif self.line:match("^%s+at [^ ]") then
             -- Looks like a line from exception stack
@@ -93,13 +101,18 @@ function LogParse:tryParseLogs()
             -- Probably msg containing newlines.
             self:appendLogMsg();
         end
-
+        ::nextLine::
+    end
+    if self.numBrokenLogLines ~= 0 then
+        stderr:write("[WARN ] Skiped ".. self.numBrokenLogLines .." entries with broken dates\n")
     end
 end
 
 
 function LogParse:initLogEntryFromLine()
-    self:publishLogEntry();
+    if self.thisEntryIsBroken then return end
+
+    self:publishLogEntry()
     local log = self:getOrNewLogEntry();
 
     -- Try some alternative parsers
@@ -369,7 +382,7 @@ end
 
 function LogParse:publishLogEntry()
     local log = self.log
-    if not log then
+    if not log or self.thisEntryIsBroken then
         return -- nothing to do
     end
     if not log.raw then
diff --git a/src/main/paisa-nonslim/README.txt b/src/main/paisa-nonslim/README.txt
index 21cf57a..7ee49bd 100644
--- a/src/main/paisa-nonslim/README.txt
+++ b/src/main/paisa-nonslim/README.txt
@@ -20,8 +20,62 @@ Evtl für diese services den jssc als "provided" angeben.
   && PATH_TO_THE_ONLY_REAL_BROWSER="C:/Users/fankhauseand/.opt/FirefoxPortable-105.0.1/FirefoxPortable.exe" \
 
   && "${PATH_TO_THE_ONLY_REAL_BROWSER:?}" \
-    `# Remaining builds` \
-    https://jenkinspaisa-temp.tools.pnet.ch/job/SERVICE/job/SDCISA-15648-RemoveSlimPackaging-n1/ \
+    `# waiting for jenkins build ` \
+    `# waiting for feedback from rudins ` \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/colin/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    `# LastSuccessfull build at 20240919 ` \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/slarti/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/captain/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/megacamel/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/guide/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/allitnil/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/babelfish/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/barman/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/benjy/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/bentstick/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/blart/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/caveman/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/deep/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/drdan/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/hooli/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/jeltz/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/kwaltz/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/loon/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/magician/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/minetti/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/mown/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/poodoo/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/prosser/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/streetmentioner/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/towel/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/vannharl/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/vogon/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/vroom/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/zaphake/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/heimdall/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    `# LastSuccessfull build at 20240920 ` \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/thor/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/rob/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/pobble/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/nowwhat/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/zem/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/trillian/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/deep/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+    `# Just here to have them somewhere ` \
+    https://jenkinspaisa-temp.tools.pnet.ch/job/platform/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+
+
+  && for S in rob thor pobble colin nowwhat zem slarti captain megacamel guide allitnil babelfish barman benjy bentstick blart caveman deep drdan hooli jeltz kwaltz loon magician minetti mown poodoo prosser streetmentioner towel vannharl vogon vroom zaphake heimdall platform trillian deep;
+     do \
+         printf '%-20s%s\n' "$S" "$(/c/work/tmp/bin/JenkinsReBuild.exe --cookie "${COOKIE?}" --branch SDCISA-15648-RemoveSlimPackaging-n2 --service "$S" 2>&1)"; \
+     done \
+
+
+## TaskQueue
+
+- await feedback for "pobble" from sandro due to "flanian artifact missing"
+- await feedback for "thor" from sandro (20240919)
+- await feedback for "rob" from sandro (20240919)
 
 
 ## Installation
diff --git a/src/main/paisa-nonslim/foo.js b/src/main/paisa-nonslim/foo.js
index 2026dda..8bc1ff3 100644
--- a/src/main/paisa-nonslim/foo.js
+++ b/src/main/paisa-nonslim/foo.js
@@ -265,6 +265,21 @@ Related:
 
     function getJettyServiceNamesAsArray( app, onDone ){
         setImmediate(onDone, null, [ /*TODO get via args/file */
+
+            /****** TryBuild early, because other depend on them ******/
+            //"platform",
+            //"slarti", "captain", "megacamel", "guide",
+            /****** "regular" builds ******/
+            //"allitnil", "babelfish", "barman", "benjy", "bentstick", "blart", "caveman", "colin",
+            //"deep", "drdan", "heimdall", "hooli", "jeltz", "kwaltz", "loon", "magician",
+            //"minetti", "mown", "nowwhat", "pobble", "poodoo", "prosser", "streetmentioner", "thor",
+            //"towel", "vannharl", "vogon", "vroom", "zaphake", "zem",
+            /****** Depends on 'slarti', 'captain' ******/
+            //"rob",
+            /****** Depends on 'slarti', 'megacamel' ******/
+            //"trillian",
+            /****** Depends on 'slarti', 'guide', 'trillian' ******/
+            //"deep",
         ]);
     }
 
diff --git a/src/main/paisa-nonslim/patches/thor.patch b/src/main/paisa-nonslim/patches/thor.patch
new file mode 100644
index 0000000..4ad026d
--- /dev/null
+++ b/src/main/paisa-nonslim/patches/thor.patch
@@ -0,0 +1,22 @@
+
+--- a/pom.xml
++++ b/pom.xml
+@@ -7,7 +7,7 @@
+         <groupId>ch.post.it.paisa.service</groupId>
+         <!-- Caution: when changing the parent version number, also change the
+             platform.version below -->
+-        <version>03.06.46.01-PR-388-SNAPSHOT</version>
++        <version>${j21.platform.version}</version>
+     </parent>
+
+
+--- a/pom.xml
++++ b/pom.xml
+@@ -17,7 +17,7 @@
+     <name>thor</name>
+     <properties>
+-        <platform.version>03.06.46.01-PR-388-SNAPSHOT</platform.version>
++        <platform.version>${j21.platform.version}</platform.version>
+         <service.name>thor</service.name>
+         <service.port>9103</service.port>
+