bot/src/bot/bot.json

@@ -16,7 +16,6 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core==2023.10.1",
       "cpl-translation==2023.4.0.post1",
       "cpl-query==2023.10.0",
       "cpl-discord==2023.10.0.post1",
@@ -34,7 +33,8 @@
       "discord==2.3.2",
       "bs4==0.0.1",
       "lxml==4.9.3",
-      "python-valve==0.2.1"
+      "python-valve==0.2.1",
+      "cpl-core==2023.10.2"
     ],
     "DevDependencies": [
       "cpl-cli==2023.4.0.post3",

bot/src/bot_data/db_context.py

@@ -40,6 +40,7 @@ class DBContext(DatabaseContext):
             self._fails += 1
             try:
                 time.sleep(0.5)
+                self._logger.debug(__name__, "Retry select")
                 return self.select(statement)
             except Exception as e:
                 pass

web/package.json

@@ -1,56 +1,56 @@
 {
-  "name": "web",
-  "version": "1.2.5",
-  "scripts": {
-    "ng": "ng",
-    "update-version": "ts-node update-version.ts",
-    "prestart": "npm run update-version",
-    "start": "ng serve",
-    "prebuild": "npm run update-version",
-    "build": "ng build",
-    "watch": "ng build --watch --configuration development",
-    "test": "ng test",
-    "gv": "echo $npm_package_version",
-    "predocker-build": "npm run update-version",
-    "docker-build": "export VERSION=$npm_package_version; ng build; docker build -t sh-edraft.de/sdb-web:$VERSION .",
-    "docker-build-dev": "export VERSION=$npm_package_version; ng build --configuration development; docker build -t sh-edraft.de/sdb-web:$VERSION .",
-    "docker-build-stage": "export VERSION=$npm_package_version; ng build --configuration staging; docker build -t sh-edraft.de/sdb-web:$VERSION ."
-  },
-  "private": true,
-  "dependencies": {
-    "@angular/animations": "^15.1.4",
-    "@angular/common": "^15.1.4",
-    "@angular/compiler": "^15.1.4",
-    "@angular/core": "^15.1.4",
-    "@angular/forms": "^15.1.4",
-    "@angular/platform-browser": "^15.1.4",
-    "@angular/platform-browser-dynamic": "^15.1.4",
-    "@angular/router": "^15.1.4",
-    "@auth0/angular-jwt": "^5.1.0",
-    "@microsoft/signalr": "^6.0.9",
-    "@ngx-translate/core": "^14.0.0",
-    "@ngx-translate/http-loader": "^7.0.0",
-    "@types/socket.io-client": "^3.0.0",
-    "moment": "^2.29.4",
-    "primeicons": "^6.0.1",
-    "primeng": "^15.2.0",
-    "rxjs": "~7.5.0",
-    "socket.io-client": "^4.5.3",
-    "zone.js": "~0.11.4"
-  },
-  "devDependencies": {
-    "@angular-devkit/build-angular": "^15.1.5",
-    "@angular/cli": "~15.1.5",
-    "@angular/compiler-cli": "^15.1.4",
-    "@types/jasmine": "~4.0.0",
-    "@types/node": "^18.11.9",
-    "jasmine-core": "~4.1.0",
-    "karma": "~6.3.0",
-    "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage": "~2.2.0",
-    "karma-jasmine": "~5.0.0",
-    "karma-jasmine-html-reporter": "~1.7.0",
-    "tslib": "^2.4.1",
-    "typescript": "~4.9.5"
-  }
-}
+    "name": "web",
+    "version": "1.2.5",
+    "scripts": {
+        "ng": "ng",
+        "update-version": "ts-node update-version.ts",
+        "prestart": "npm run update-version",
+        "start": "ng serve",
+        "prebuild": "npm run update-version",
+        "build": "ng build",
+        "watch": "ng build --watch --configuration development",
+        "test": "ng test",
+        "gv": "echo $npm_package_version",
+        "predocker-build": "npm run update-version",
+        "docker-build": "export VERSION=$npm_package_version; ng build; docker build -t sh-edraft.de/sdb-web:$VERSION .",
+        "docker-build-dev": "export VERSION=$npm_package_version; ng build --configuration development; docker build -t sh-edraft.de/sdb-web:$VERSION .",
+        "docker-build-stage": "export VERSION=$npm_package_version; ng build --configuration staging; docker build -t sh-edraft.de/sdb-web:$VERSION ."
+    },
+    "private": true,
+    "dependencies": {
+        "@angular/animations": "^15.1.4",
+        "@angular/common": "^15.1.4",
+        "@angular/compiler": "^15.1.4",
+        "@angular/core": "^15.1.4",
+        "@angular/forms": "^15.1.4",
+        "@angular/platform-browser": "^15.1.4",
+        "@angular/platform-browser-dynamic": "^15.1.4",
+        "@angular/router": "^15.1.4",
+        "@auth0/angular-jwt": "^5.1.0",
+        "@microsoft/signalr": "^6.0.9",
+        "@ngx-translate/core": "^14.0.0",
+        "@ngx-translate/http-loader": "^7.0.0",
+        "@types/socket.io-client": "^3.0.0",
+        "moment": "^2.29.4",
+        "primeicons": "^6.0.1",
+        "primeng": "^15.2.0",
+        "rxjs": "~7.5.0",
+        "socket.io-client": "^4.5.3",
+        "zone.js": "~0.11.4"
+    },
+    "devDependencies": {
+        "@angular-devkit/build-angular": "^15.1.5",
+        "@angular/cli": "~15.1.5",
+        "@angular/compiler-cli": "^15.1.4",
+        "@types/jasmine": "~4.0.0",
+        "@types/node": "^18.11.9",
+        "jasmine-core": "~4.1.0",
+        "karma": "~6.3.0",
+        "karma-chrome-launcher": "~3.1.0",
+        "karma-coverage": "~2.2.0",
+        "karma-jasmine": "~5.0.0",
+        "karma-jasmine-html-reporter": "~1.7.0",
+        "tslib": "^2.4.1",
+        "typescript": "~4.9.5"
+    }
+}

web/src/assets/version.json

@@ -1,7 +1,7 @@
 {
-  "WebVersion": {
-    "Major": "1",
-    "Minor": "2",
-    "Micro": "5"
-  }
-}
+    "WebVersion": {
+        "Major": "1",
+        "Minor": "2",
+        "Micro": "5"
+    }
+}