Merge branch 'main' into faster-trash

greenbone · Feb 12, 2024 · eba5a12 · eba5a12
2 parents 6f8ece9 + f7819e0
commit eba5a12
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 144 deletions.
diff --git a/.docker/gsad_log.conf b/.docker/gsad_log.conf
@@ -2,26 +2,26 @@
 prepend=%t %s %p
 separator=:
 prepend_time_format=%Y-%m-%d %Hh%M.%S %Z
-file=/var/log/gvm/gsad.log
+file=-
 level=127
 
 [gsad  gmp]
 prepend=%t %s %p
 separator=:
 prepend_time_format=%Y-%m-%d %Hh%M.%S %Z
-file=/var/log/gvm/gsad.log
+file=-
 level=127
 
 [gsad http]
 prepend=%t %s %p
 separator=:
 prepend_time_format=%Y-%m-%d %Hh%M.%S %Z
-file=/var/log/gvm/gsad.log
+file=-
 level=127
 
 [*]
 prepend=%t %s %p
 separator=:
 prepend_time_format=%Y-%m-%d %Hh%M.%S %Z
-file=/var/log/gvm/gsad.log
+file=-
 level=16
diff --git a/.docker/start-gsad.sh b/.docker/start-gsad.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 
-[ -z "$GSAD_ARGS" ] && GSAD_ARGS="--http-only"
+[ -z "$GSAD_ARGS" ] && GSAD_ARGS="-f --http-only"
 
 echo "starting gsad"
-gsad $GSAD_ARGS ||
-	(cat /var/log/gvm/gsad.log && exit 1)
-
-tail -f /var/log/gvm/gsad.log
+gsad $GSAD_ARGS 2>&1 | tee /var/log/gvm/gsad.log
diff --git a/.github/workflows/release-pontos.yml → .github/workflows/release.yml b/.github/workflows/release-pontos.yml → .github/workflows/release.yml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,7 @@ cmake_minimum_required (VERSION 3.0)
 
 message ("-- Configuring gsad")
 
-project (gsad VERSION 22.9.1 LANGUAGES C)
+project (gsad VERSION 22.9.2 LANGUAGES C)
 
 if (NOT DEFINED PROJECT_VERSION_STRING)
    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

diff --git a/README.md b/README.md
@@ -206,6 +206,6 @@ github](https://github.com/greenbone/gsad/issues) first.
 
 ## License
 
-Copyright (C) 2009-2022 [Greenbone AG](https://www.greenbone.net/)
+Copyright (C) 2009-2024 [Greenbone AG](https://www.greenbone.net/)
 
 Licensed under the [GNU Affero General Public License v3.0 or later](LICENSE).
diff --git a/RELEASE.md b/RELEASE.md
diff --git a/changelog.toml b/changelog.toml
@@ -1,11 +1,9 @@
 commit_types = [
-    { message = "^add", group = "Added"},
-    { message = "^remove", group = "Removed"},
-    { message = "^change", group = "Changed"},
-    { message = "^fix", group = "Bug Fixes"},
-    { message = "^doc", group = "Documentation"},
-    { message = "^refactor", group = "Refactor"},
-    { message = "^test", group = "Testing"},
+    { message = "^add", group = "Added" },
+    { message = "^remove", group = "Removed" },
+    { message = "^change", group = "Changed" },
+    { message = "^fix", group = "Bug Fixes" },
+    { message = "^doc", group = "Documentation" },
+    { message = "^refactor", group = "Refactor" },
+    { message = "^test", group = "Testing" },
 ]
-
-changelog_dir = "changelog"
diff --git a/changelog/v22.4.md b/changelog/v22.4.md
diff --git a/cmake/ProjectVersion.cmake b/cmake/ProjectVersion.cmake
@@ -37,11 +37,7 @@ endif (GIT_REVISION)
 
 string(LENGTH ${PROJECT_VERSION_MINOR} PROJECT_VERSION_MINOR_LENGTH)
 
-if (PROJECT_VERSION_MINOR_LENGTH LESS 2)
-  set (PROJECT_VERSION_MINOR_STRING "0${PROJECT_VERSION_MINOR}")
-else ()
-  set (PROJECT_VERSION_MINOR_STRING "${PROJECT_VERSION_MINOR}")
-endif ()
+set (PROJECT_VERSION_MINOR_STRING "${PROJECT_VERSION_MINOR}")
 
 # If PROJECT_BETA_RELEASE is set to "0", the version string will be set to:
 #   "major.minor+alpha"

diff --git a/src/gsad.c b/src/gsad.c
@@ -1276,12 +1276,10 @@ compress_response_brotli (const size_t res_len, const char *res,
     {
       *comp = (char *) cbuf;
       *comp_len = cbuf_size;
-      g_warning ("%s: 1", __func__);
       return 1;
     }
 
   g_free (cbuf);
-  g_warning ("%s: 0", __func__);
   return 0;
 }
 #endif