summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/note/burncdrom/burncdrom.txt2
-rw-r--r--doc/note/links/links.txt1
-rw-r--r--doc/note/setup/setup-debian.txt2
-rw-r--r--src/main/paisa-nonslim/README.txt9
-rw-r--r--src/main/paisa-nonslim/foo.js22
-rw-r--r--src/main/paisa-nonslim/patches/deep.patch6
-rw-r--r--src/main/paisa-nonslim/patches/minetti.patch9
-rw-r--r--src/main/paisa-nonslim/patches/rob.patch52
-rw-r--r--src/main/paisa/JenkinsReBuild.c111
-rw-r--r--src/main/patch/lazlar/default.patch44
10 files changed, 178 insertions, 80 deletions
diff --git a/doc/note/burncdrom/burncdrom.txt b/doc/note/burncdrom/burncdrom.txt
index 0760142..92de002 100644
--- a/doc/note/burncdrom/burncdrom.txt
+++ b/doc/note/burncdrom/burncdrom.txt
@@ -18,7 +18,7 @@ WARN: Do NOT dump windoof ISO to USB! It won't work. See further down.
## "Burn" to USB from ISO (NOT disc)
- dd bs=4M if=path/to/my.iso of=/dev/sdX status=progress oflag=sync
+ $SUDO dd bs=4M if=path/to/my.iso of=/dev/sdX status=progress oflag=sync
## Get checksum of disc (NOT usb)
diff --git a/doc/note/links/links.txt b/doc/note/links/links.txt
index e964b12..a958590 100644
--- a/doc/note/links/links.txt
+++ b/doc/note/links/links.txt
@@ -489,6 +489,7 @@ Links (Aka argument amplifiers)
## FileLogging is a MUST have (kibana is bullsh**)
- [example](https://jira.post.ch/browse/SDCISA-8382?focusedCommentId=1554435&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-1554435)
- [example](https://jira.post.ch/browse/SDCISA-13655)
+- [thought loggt nicht ins Kibana?](https://jira.post.ch/browse/SDCISA-17480)
- [warning](https://jira.post.ch/browse/SDCISA-7230?focusedCommentId=1550476&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-1550476)
- [FluentD logging unreliable](https://jira.post.ch/browse/SDCISA-16205)
- [K8S: Service logs not streamed to Kibana?](https://jira.post.ch/browse/SDCISA-16335)
diff --git a/doc/note/setup/setup-debian.txt b/doc/note/setup/setup-debian.txt
index c0992dc..5980f38 100644
--- a/doc/note/setup/setup-debian.txt
+++ b/doc/note/setup/setup-debian.txt
@@ -84,7 +84,7 @@ UUID=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx /mnt/nameOfHdd ext4 noatime 0 2
&& $SUDO apt install -y --no-install-recommends xorg openbox mate-terminal lightdm light-locker feh scrot lxpanel qalculate-gtk gmrun gnome-system-monitor \
&& mkdir ~/.config ~/.config/openbox || true \
- && update-alternatives \
+ && update-alternatives `# TODO needs args` \
Populate "/etc/environment" as described by "./etc-environment".
diff --git a/src/main/paisa-nonslim/README.txt b/src/main/paisa-nonslim/README.txt
index a25ad9e..21cf57a 100644
--- a/src/main/paisa-nonslim/README.txt
+++ b/src/main/paisa-nonslim/README.txt
@@ -7,13 +7,6 @@ Currently working on "SDCISA-15648".
[j21 migration branches sandro](https://wikit.post.ch/display/ISA/ISA+Java21+Update)
-
-git d -w $(git mb origin/develop origin/SDCISA-15636-Migrate-to-Java-21) origin/SDCISA-15636-Migrate-to-Java-21
-
-
-git d -w $(git mb origin/develop origin/SDCISA-15636-Migrate-to-Java-21-test) origin/SDCISA-15636-Migrate-to-Java-21-test --name-status
-
-
DSTDIR=/tmp
tar czf "${DSTDIR:?}"/andy-noslim-$(date -u +%Y%m%d-%H%M%S).tgz -- conf isa-launch-* isa.sh logs preflux prefluxer-* puppetconfig_version repo
@@ -24,8 +17,6 @@ jssc sollte hier drin sein -> "alice-docker-service-base*.jar"
Evtl für diese services den jssc als "provided" angeben.
-TODO awaiting builds again with (hopefully fixed jssc.so):
-
&& PATH_TO_THE_ONLY_REAL_BROWSER="C:/Users/fankhauseand/.opt/FirefoxPortable-105.0.1/FirefoxPortable.exe" \
&& "${PATH_TO_THE_ONLY_REAL_BROWSER:?}" \
diff --git a/src/main/paisa-nonslim/foo.js b/src/main/paisa-nonslim/foo.js
index 7643129..2dd1847 100644
--- a/src/main/paisa-nonslim/foo.js
+++ b/src/main/paisa-nonslim/foo.js
@@ -184,7 +184,8 @@ Related:
var patchAsStr;
var mangledPlatformVersion, mangledServiceVersion, mangledSlartiVersion;
var propsToReplace = [ "j21.service.mangledVersion", "j21.platform.version",
- "j21.captain.mangledVersion", "j21.slarti.mangledVersion", "j21.megacamel.mangledVersion" ];
+ "j21.captain.mangledVersion", "j21.slarti.mangledVersion", "j21.megacamel.mangledVersion",
+ "j21.guide.mangledVersion", "j21.trillian.mangledVersion", ];
var propValsByKey = {};
fs.readFile(path, 'utf8', TODO_sBECAHhRAgCcPAIA);
function TODO_sBECAHhRAgCcPAIA( ex, patchAsStr_ ){
@@ -201,9 +202,9 @@ Related:
if( !k ){ replaceProperties(); return; }
if( !new RegExp("\\${"+ k +"}").test(patchAsStr) ){ getNextProperty(); return; }
var subj = false ? null
- : (k == "j21.service.mangledVersion") ? thingyName
- : (k == "j21.megacamel.mangledVersion") ? thingyName
: (k == "j21.platform.version") ? "platform"
+ : (k == "j21.guide.mangledVersion") ? "guide"
+ : (k == "j21.megacamel.mangledVersion") ? "megacamel"
: null;
if( !subj ){ subj = /^j21.([^.]+).mangledVersion$/.exec(k)[1]; }
if( !subj ){ onDone(Error("TODO_NkICAG1HAgCDYgIA "+ k)); return; }
@@ -319,11 +320,14 @@ Related:
rsp.on("end", TODO_MRYCAOIzAgAKFQIA);
}
function TODO_MRYCAOIzAgAKFQIA(){
- var pat = new RegExp('\n<a href="('+ app.versionPrefix +'[A-Za-z0-9]+-SNAPSHOT)/">[^<]+</a> +([0-9]{2})-([A-Za-z]{3})-([0-9]{4}) ([0-9]{2}):([0-9]{2}) +-', "g");
+ var pat = new RegExp('\n<a href="('+ app.versionPrefix +'.+-SNAPSHOT)/">[^<]+</a> +([0-9]{2})-([A-Za-z]{3})-([0-9]{4}) ([0-9]{2}):([0-9]{2}) +-', "g");
var latestVersion, latestDate;
rspBody.replace(pat, function( match, version, day, mthShrt, yr, hrs, mins, off, rspBody, groupNameMap ){
/* [FUCK those FUCKING DAMN bullshit formats!!!](https://xkcd.com/1179/) */
- var mth = (mthShrt == "Jul") ? "07" : null;
+ var mth = false ? null
+ : (mthShrt == "Jul") ? "07"
+ : (mthShrt == "Sep") ? "09"
+ : null;
if( !mth ){ throw Error("TODO_1iUCAA1ZAgBALgIA "+ mthShrt); }
var builtAt = yr +"-"+ mth +"-"+ day +" "+ hrs +":"+ mins;
if( latestVersion == null || builtAt > latestDate ){
@@ -1197,10 +1201,10 @@ Related:
issueKey: "SDCISA-15648",
branchName: null,
commitMsg: null,
- versionPrefix: "U0RdSVNB", /* const part of generated seq above (MUST have for find version later) */
- /* generate: {printf '%s-SNAPSHOT\n' "$(dev-urandom -c 42|base64|tr -d '/+='|head -c8)"} */
- platformSnapVersion: "ol4AAD0s-SNAPSHOT",
- serviceSnapVersion: "ol4AAD0s-SNAPSHOT",
+ versionPrefix: "0.0.0-U0RdSV", /* const part of generated seq above (MUST have for find version later) */
+ /* generate: {date +%N|md5sum -b -|base64|tr -d '/+='|head -c6 && echo} */
+ platformSnapVersion: "pikAAO-SNAPSHOT",
+ serviceSnapVersion: "pikAAO-SNAPSHOT",
};
app.branchName = app.issueKey +"-RemoveSlimPackaging-n2";
app.commitMsg = "["+ app.issueKey +"] Remove slim packaging";
diff --git a/src/main/paisa-nonslim/patches/deep.patch b/src/main/paisa-nonslim/patches/deep.patch
index 5982776..1f8b922 100644
--- a/src/main/paisa-nonslim/patches/deep.patch
+++ b/src/main/paisa-nonslim/patches/deep.patch
@@ -12,11 +12,11 @@
storage: [version: '00.24.00.00'],
deep: [version: '%currentBranch%'],
- slarti: [version: '03.15.12.01-PR-1019-SNAPSHOT'],
-+ slarti: [version: '${j21.service.mangledVersion}'],
++ slarti: [version: '${j21.slarti.mangledVersion}'],
- guide: [version: '02.14.13.01-PR-122-SNAPSHOT'],
-+ guide: [version: '${j21.service.mangledVersion}'],
++ guide: [version: '${j21.guide.mangledVersion}'],
- trillian: [version: '03.00.38.01-PR-413-SNAPSHOT']
-+ trillian: [version: '${j21.service.mangledVersion}']
++ trillian: [version: '${j21.trillian.mangledVersion}']
]
]
diff --git a/src/main/paisa-nonslim/patches/minetti.patch b/src/main/paisa-nonslim/patches/minetti.patch
index 5f2b05b..c49fba1 100644
--- a/src/main/paisa-nonslim/patches/minetti.patch
+++ b/src/main/paisa-nonslim/patches/minetti.patch
@@ -15,7 +15,8 @@
@@ -20,16 +20,16 @@
backendInstance: [
services: [
- houston: [version: '02.01.66.01-PR-519-SNAPSHOT'],
+- houston: [version: '02.01.66.01-PR-519-SNAPSHOT'],
++ houston: [version: '02.01.76.00'],
- platform: [version: '03.06.40.01-PR-388-SNAPSHOT'],
+ platform: [version: '${j21.platform.version}'],
storage: [version: '00.24.00.00']
@@ -23,11 +24,13 @@
],
vehicleInstance: [
services: [
- eagle: [version: '02.01.26.01-PR-379-SNAPSHOT'],
+- eagle: [version: '02.01.26.01-PR-379-SNAPSHOT'],
++ eagle: [version: '02.01.27.00'],
- platform: [version: '03.06.40.01-PR-388-SNAPSHOT'],
+ platform: [version: '${j21.platform.version}'],
storage: [version: '00.24.00.00'],
- slarti: [version: '03.15.09.01-PR-1019-SNAPSHOT'],
+- slarti: [version: '03.15.09.01-PR-1019-SNAPSHOT'],
++ slarti: [version: '${j21.slarti.mangledVersion}'],
minetti: [version: '%currentBranch%']
],
houstonInstance: 'backendInstance'
diff --git a/src/main/paisa-nonslim/patches/rob.patch b/src/main/paisa-nonslim/patches/rob.patch
index 4d3472b..1b8584a 100644
--- a/src/main/paisa-nonslim/patches/rob.patch
+++ b/src/main/paisa-nonslim/patches/rob.patch
@@ -33,13 +33,13 @@
'data-nova': [version: '14.183.0.20240731-1209.P.P.9238.0'],
---- a/Jenkinsfile
-+++ b/Jenkinsfile
-@@ -47,3 +47,3 @@ serviceBuildPipeline([
- .saveArtifacts()
-- .executeSonar([failOnQualityGateFailure: true])
-+ // TODO: .executeSonar([failOnQualityGateFailure: true])
- }
+ OBSOLETE? --- a/Jenkinsfile
+ OBSOLETE? +++ b/Jenkinsfile
+ OBSOLETE? @@ -47,3 +47,3 @@ serviceBuildPipeline([
+ OBSOLETE? .saveArtifacts()
+ OBSOLETE? - .executeSonar([failOnQualityGateFailure: true])
+ OBSOLETE? + // TODO: .executeSonar([failOnQualityGateFailure: true])
+ OBSOLETE? }
--- a/pom.xml
@@ -55,25 +55,25 @@
---- a/pom.xml
-+++ a/pom.xml
-@@ -285,6 +285,16 @@
- <artifactId>linti</artifactId>
- <version>${linti.version}</version>
- </dependency>
-+ <dependency>
-+ <groupId>org.glassfish</groupId>
-+ <artifactId>jakarta.el</artifactId>
-+ <version>4.0.2</version> <!-- TODO move this version somewhere else -->
-+ </dependency>
-+ <dependency>
-+ <groupId>org.eclipse.jetty.ee10</groupId>
-+ <artifactId>jetty-ee10-webapp</artifactId>
-+ <version>12.0.12</version> <!-- TODO move this version somewhere else -->
-+ </dependency>
- </dependencies>
- </dependencyManagement>
- <properties>
+ OBSOLETE? --- a/pom.xml
+ OBSOLETE? +++ a/pom.xml
+ OBSOLETE? @@ -285,6 +285,16 @@
+ OBSOLETE? <artifactId>linti</artifactId>
+ OBSOLETE? <version>${linti.version}</version>
+ OBSOLETE? </dependency>
+ OBSOLETE? + <dependency>
+ OBSOLETE? + <groupId>org.glassfish</groupId>
+ OBSOLETE? + <artifactId>jakarta.el</artifactId>
+ OBSOLETE? + <version>4.0.2</version> <!-- TODO move this version somewhere else -->
+ OBSOLETE? + </dependency>
+ OBSOLETE? + <dependency>
+ OBSOLETE? + <groupId>org.eclipse.jetty.ee10</groupId>
+ OBSOLETE? + <artifactId>jetty-ee10-webapp</artifactId>
+ OBSOLETE? + <version>12.0.12</version> <!-- TODO move this version somewhere else -->
+ OBSOLETE? + </dependency>
+ OBSOLETE? </dependencies>
+ OBSOLETE? </dependencyManagement>
+ OBSOLETE? <properties>
--- a/pom.xml
diff --git a/src/main/paisa/JenkinsReBuild.c b/src/main/paisa/JenkinsReBuild.c
index 03baeab..af87f72 100644
--- a/src/main/paisa/JenkinsReBuild.c
+++ b/src/main/paisa/JenkinsReBuild.c
@@ -18,6 +18,23 @@
#endif
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#if _WIN32
+# include <windows.h>
+#endif
+
+#include <Garbage.h>
+
+
+#define STR_QUOT_(s) #s
+#define STR_QUOT(s) STR_QUOT_(s)
+#define LOGDBG(...) fprintf(stderr, __VA_ARGS__)
+#define LOGERR(...) fprintf(stderr, __VA_ARGS__)
+
+#define FLG_isHelp (1<<0)
+
typedef struct App App;
@@ -27,9 +44,23 @@ struct App {
int mAGIC;
int flg;
int exitCode;
+ struct GarbageEnv **env;
+ void *envMem[SIZEOF_struct_GarbageEnv/sizeof(void*)];
};
+static inline struct App* assert_is_App( void*p, char const*f, int l ){
+#if !NDEBUG
+ if( p == NULL ){ LOGDBG("assert(app != NULL) %s:%d\n", f, l); assert(0); }
+ App *a = p;
+ if( a->mAGIC != App_mAGIC ){
+ LOGDBG("assert(app.mAGIC != %d) %s:%d\n", a->mAGIC, f, l); assert(0); }
+#endif
+ return p;
+}
+#define assert_is_App(p) assert_is_App(p, __FILE__, __LINE__)
+
+
static void printHelp( void ){
fprintf(stdout, "%s%s%s",
" \n"
@@ -41,7 +72,7 @@ static void printHelp( void ){
}
-static int parseArgs( App*app, int argc, char**argv ){
+static int parseArgs( App*app, char**argv ){
register int iA = 0;
nextArg:;
char *arg = argv[++iA];
@@ -58,24 +89,92 @@ verify:
}
-static int run( App*app ){
- assert(!"TODO_YHYCAOUsAgAsWAIA");
+static void HttpReq_pushIoTask( void(*task)(void*arg), void*arg, void*app_ ){
+ App*const app = assert_is_App(app_);
+ (*app->env)->enqueBlocking(app->env, task, arg);
+}
+
+
+static void HttpReq_onError( int retval, void*mentorCls ){
+ LOGDBG("[DEBUG] %s(eno=%d)\n", __func__, retval);
+}
+
+
+static void HttpReq_onRspHdr(
+ const char*proto, int proto_len, int rspCode, const char*phrase, int phrase_len,
+ const struct Garbage_HttpMsg_Hdr*hdrs, int hdrs_cnt,
+ struct Garbage_HttpClientReq**req, void*app_
+){
+ //App*const app = assert_is_App(app_);
+ if( rspCode != 200 ){
+ LOGDBG("%.*s %d %.*s\n", proto_len, proto, rspCode, phrase_len, phrase);
+ for( int i = 0 ; i < hdrs_cnt ; ++i ){
+ LOGDBG("%.*s: %.*s\n", hdrs[i].key_len, hdrs[i].key, hdrs[i].val_len, hdrs[i].val);
+ }
+ LOGDBG("\n");
+ }
+}
+
+
+static void HttpReq_onRspBody(
+ const char*buf, int buf_len, struct Garbage_HttpClientReq**req, void*app_
+){
+ //App*const app = assert_is_App(app_);
+ // TODO if( httpRspCode != 200 ){
+ LOGDBG("%.*s", buf_len, buf);
+ // TODO }
+}
+
+
+static void HttpReq_onRspDone( struct Garbage_HttpClientReq**req, void*app_ ){
+ LOGDBG("[DEBUG] TODO_FlsAAAwZAADIHgAA %s()\n", __func__);
+}
+
+
+static void run( void*app_ ){
+ App*const app = assert_is_App(app_);
+ struct Garbage_HttpClientReq **req = NULL;
+ static struct Garbage_HttpClientReq_Mentor httpMentor = {
+ .pushIoTask = HttpReq_pushIoTask,
+ .onError = HttpReq_onError,
+ .onRspHdr = HttpReq_onRspHdr,
+ .onRspBody = HttpReq_onRspBody,
+ .onRspDone = HttpReq_onRspDone,
+ };
+ assert(5*sizeof(void*) == sizeof httpMentor);
+ req = (*app->env)->newHttpClientReq(app->env, &httpMentor, app,
+ &(struct Garbage_HttpClientReq_Opts){
+ //.mallocator = NULL,
+ //.socketMgr = NULL,
+ .mthd = "GET",
+ .host = "127.0.0.1",
+ .url = "/guguseli/gagageli",
+ .port = 8081,
+ //.hdrs = struct Garbage_HttpMsg_Hdr*,
+ //.hdrs_cnt = int,
+ });
+ (*req)->resume(req);
}
int main( int argc, char**argv ){
+#if _WIN32
+ WSAStartup(1, &(WSADATA){0});
+#endif
+ (void)argc;
App app = {0}; assert((void*)0 == NULL);
#define app (&app)
app->mAGIC = App_mAGIC;
app->exitCode = -1;
- if( parseArgs(app, argc, argv) ){ goto endFn; }
+ if( parseArgs(app, argv) ){ goto endFn; }
if( app->flg & FLG_isHelp ){ printHelp(); goto endFn; }
app->exitCode = 0;
- run(app);
+ app->env = GarbageEnv_ctor(app->envMem, sizeof app->envMem);
+ (*app->env)->enqueBlocking(app->env, run, app);
+ (*app->env)->runUntilDone(app->env);
endFn:
return !!app->exitCode;
#undef app
}
-
diff --git a/src/main/patch/lazlar/default.patch b/src/main/patch/lazlar/default.patch
index 64d6632..228840a 100644
--- a/src/main/patch/lazlar/default.patch
+++ b/src/main/patch/lazlar/default.patch
@@ -39,26 +39,26 @@
registered service route is of any use for my eddie which runs outside the VM
and so has no chance to see lazlar via its IP inside the VM.
---- a/lazlar-web/src/test/java/ch/post/it/paisa/lazlar/web/LazlarStarter.java
-+++ b/lazlar-web/src/test/java/ch/post/it/paisa/lazlar/web/LazlarStarter.java
-@@ -7,6 +7,18 @@
- boolean a = false;
- assert a = true;
- if (!a) throw new RuntimeException("https://stackoverflow.com/a/68893479/4415884");
-- ServiceStarter.create().start();
-+ String chPostItHost = System.getProperty("ch.post.it.host");
-+ String paisaServiceHost = System.getProperty("paisa.service.host");
-+ new Thread(() -> {
-+ for(int i = 0 ; i < 5000 ; ++i ){
-+ System.setProperty("ch.post.it.host", chPostItHost);
-+ System.setProperty("paisa.service.host", paisaServiceHost);
-+ try{
-+ Thread.sleep(1);
-+ }catch(InterruptedException ex){ throw new UnsupportedOperationException/*TODO*/("not impl yet",ex);}
-+ }
-+ }).start();
-+ Thread.yield();
-+ ServiceStarter.create().withName("lazlar").withPort(7042).start();
- }
- }
+ UNUSED --- a/lazlar-web/src/test/java/ch/post/it/paisa/lazlar/web/LazlarStarter.java
+ UNUSED +++ b/lazlar-web/src/test/java/ch/post/it/paisa/lazlar/web/LazlarStarter.java
+ UNUSED @@ -7,6 +7,18 @@
+ UNUSED boolean a = false;
+ UNUSED assert a = true;
+ UNUSED if (!a) throw new RuntimeException("https://stackoverflow.com/a/68893479/4415884");
+ UNUSED - ServiceStarter.create().start();
+ UNUSED + String chPostItHost = System.getProperty("ch.post.it.host");
+ UNUSED + String paisaServiceHost = System.getProperty("paisa.service.host");
+ UNUSED + new Thread(() -> {
+ UNUSED + for(int i = 0 ; i < 5000 ; ++i ){
+ UNUSED + System.setProperty("ch.post.it.host", chPostItHost);
+ UNUSED + System.setProperty("paisa.service.host", paisaServiceHost);
+ UNUSED + try{
+ UNUSED + Thread.sleep(1);
+ UNUSED + }catch(InterruptedException ex){ throw new UnsupportedOperationException/*TODO*/("not impl yet",ex);}
+ UNUSED + }
+ UNUSED + }).start();
+ UNUSED + Thread.yield();
+ UNUSED + ServiceStarter.create().withName("lazlar").withPort(7042).start();
+ UNUSED }
+ UNUSED }
generated by cgit v1.1 at 2024-10-06 10:21:27 +0000