Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PR for new release #527

Merged
merged 12 commits into from
Sep 27, 2023
Merged

PR for new release #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
137b787
updating poms for 2.0.1 branch with snapshot versions
Aug 3, 2023
e9512c1
updating poms for 2.0.2-SNAPSHOT development
Aug 3, 2023
4531d89
updating poms for branch'release-2.0.1' with non-snapshot versions
Aug 3, 2023
e31e6f1
Merge branch 'release-2.0.1'
Aug 3, 2023
e6d47a2
updating develop poms to master versions to avoid merge conflicts
Aug 3, 2023
4f23e64
Merge branch 'master' into develop
Aug 3, 2023
150acfa
Updating develop poms back to pre merge state
Aug 3, 2023
b036d7a
#525 Try to parse request/response payload as JsonArray
mcweba Sep 26, 2023
8ccb228
Attempt to fix chromedriver setup
mcweba Sep 26, 2023
465689f
Attempts #2 to fix chromedriver setup
mcweba Sep 27, 2023
e5bf76d
Trigger build to test github actions
mcweba Sep 27, 2023
ebc868b
Merge pull request #526 from swisspost/feature/issue525_LoggingHandle…
mcweba Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ jobs:
redis-version: 4

- name: Install chromedriver
uses: nanasess/[email protected]
with:
# Optional: do not specify to match Chrome's version
chromedriver-version: '114.0.5735.90'
uses: nanasess/setup-chromedriver@v2

- name: Install, unit test
run: mvn install -Dmaven.javadoc.skip=true -PpublicRepos -B -V
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ This is a list of the custom headers used by Gateleen.
## Performance Tuning
* The amount of max open files per process should be at least 16384. You can check your max open files per process with this command `cat /proc/<process id>/limits`.
* The amount of open files depends on the amount of open Http Requests, which are holding a tcp connection which are holding a file handle.
* The important number to control the open Http Requests is the pool size of the Http Client. The higher the pool size the higher the open files.
* The important number to control the open HTTP requests is the pool size of the Http Client. The higher the pool size the higher the open files.

## Dependencies
* [vertx-rest-storage](https://github.com/swisspush/vertx-rest-storage) at least release [v2.0.2](https://github.com/swisspush/vertx-rest-storage/releases/tag/v2.0.2)
Expand Down
2 changes: 1 addition & 1 deletion gateleen-cache/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>gateleen-cache</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gateleen-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>gateleen-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gateleen-delegate/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>gateleen-delegate</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gateleen-delta/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>gateleen-delta</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gateleen-expansion/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>gateleen-expansion</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gateleen-hook-js/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>
<artifactId>gateleen-hook-js</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion gateleen-hook/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>gateleen-hook</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gateleen-kafka/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>gateleen-kafka</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gateleen-logging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>gateleen-logging</artifactId>
Expand Down
21 changes: 17 additions & 4 deletions gateleen-logging/src/main/java/org/swisspush/gateleen/logging/LoggingHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import io.vertx.core.http.HttpMethod;
import io.vertx.core.http.HttpServerRequest;
import io.vertx.core.json.DecodeException;
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.JsonObject;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.Appender;
Expand Down Expand Up @@ -294,17 +295,29 @@
requestLog.put(HEADERS, headersAsJson(requestHeaders));
responseLog.put(HEADERS, headersAsJson(responseHeaders));
if (requestPayload != null) {
String requestPayloadString = requestPayload.toString("UTF-8");

Check warning on line 298 in gateleen-logging/src/main/java/org/swisspush/gateleen/logging/LoggingHandler.java

View check run for this annotation

Codecov / codecov/patch

gateleen-logging/src/main/java/org/swisspush/gateleen/logging/LoggingHandler.java#L298 

Added line #L298 was not covered by tests
try {
requestLog.put(BODY, new JsonObject(requestPayload.toString("UTF-8")));
requestLog.put(BODY, new JsonObject(requestPayloadString));

Check warning on line 300 in gateleen-logging/src/main/java/org/swisspush/gateleen/logging/LoggingHandler.java

View check run for this annotation

Codecov / codecov/patch

gateleen-logging/src/main/java/org/swisspush/gateleen/logging/LoggingHandler.java#L300 

Added line #L300 was not covered by tests
} catch (DecodeException e) {
// ignore, bogus JSON
// maybe payload was a JsonArray
try {
requestLog.put(BODY, new JsonArray(requestPayloadString));
} catch (DecodeException ex) {
log.info("request payload could not be parsed and will not be logged");
}

Check warning on line 307 in gateleen-logging/src/main/java/org/swisspush/gateleen/logging/LoggingHandler.java

View check run for this annotation

Codecov / codecov/patch

gateleen-logging/src/main/java/org/swisspush/gateleen/logging/LoggingHandler.java#L304-L307 

Added lines #L304 - L307 were not covered by tests
}
}
if (responsePayload != null) {
String responsePayloadString = responsePayload.toString("UTF-8");

Check warning on line 311 in gateleen-logging/src/main/java/org/swisspush/gateleen/logging/LoggingHandler.java

View check run for this annotation

Codecov / codecov/patch

gateleen-logging/src/main/java/org/swisspush/gateleen/logging/LoggingHandler.java#L311 

Added line #L311 was not covered by tests
try {
responseLog.put(BODY, new JsonObject(responsePayload.toString("UTF-8")));
responseLog.put(BODY, new JsonObject(responsePayloadString));

Check warning on line 313 in gateleen-logging/src/main/java/org/swisspush/gateleen/logging/LoggingHandler.java

View check run for this annotation

Codecov / codecov/patch

gateleen-logging/src/main/java/org/swisspush/gateleen/logging/LoggingHandler.java#L313 

Added line #L313 was not covered by tests
} catch (DecodeException e) {
// ignore, bogus JSON
// maybe payload was a JsonArray
try {
responseLog.put(BODY, new JsonArray(responsePayloadString));
} catch (DecodeException ex) {
log.info("response payload could not be parsed and will not be logged");
}

Check warning on line 320 in gateleen-logging/src/main/java/org/swisspush/gateleen/logging/LoggingHandler.java

View check run for this annotation

Codecov / codecov/patch

gateleen-logging/src/main/java/org/swisspush/gateleen/logging/LoggingHandler.java#L317-L320 

Added lines #L317 - L320 were not covered by tests
}
}

Expand Down
2 changes: 1 addition & 1 deletion gateleen-merge/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>gateleen-merge</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gateleen-monitoring/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>gateleen-monitoring</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gateleen-packing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>gateleen-packing</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gateleen-player/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>gateleen-player</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gateleen-playground/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>gateleen-playground</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gateleen-qos/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>gateleen-qos</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gateleen-queue/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>gateleen-queue</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gateleen-routing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>gateleen-routing</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gateleen-runconfig/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>gateleen-runconfig</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gateleen-scheduler/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>gateleen-scheduler</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gateleen-security/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>gateleen-security</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gateleen-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>
<artifactId>gateleen-test</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion gateleen-testhelper/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>gateleen-testhelper</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gateleen-user/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>gateleen-user</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gateleen-validation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>gateleen-validation</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.swisspush.gateleen</groupId>
<artifactId>gateleen</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>gateleen</name>
<description>Middleware library based on Vert.x to build advanced JSON/REST communication servers</description>
Expand Down