Skip to content

Commit 90df7c7

Browse files
Update sender dependency (#50)
* updated sender version * fix git secrets workflow
1 parent 04ee7f9 commit 90df7c7

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

.github/workflows/main.yml

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
11
name: git-secrets
2-
32
# Controls when the workflow will run
43
# Triggers the workflow on push or pull request events but only for the main branch
54
on: [push]
6-
75
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
86
jobs:
97
# This workflow contains a single job called "main"
108
git-secrets:
119
# The type of runner that the job will run on
12-
runs-on: ubuntu-18.04
13-
10+
runs-on: ubuntu-22.04
1411
# Steps represent a sequence of tasks that will be executed as part of the job
1512
steps:
1613
- name: Check Out Source Code
17-
uses: actions/checkout@v2
18-
14+
uses: actions/checkout@v3
1915
- name: Set up Python 3.8
20-
uses: actions/setup-python@v2
16+
uses: actions/setup-python@v4
2117
with:
2218
python-version: 3.8
2319
- name: Installing dependencies
2420
run:
25-
sudo apt-get install git less openssh-server
21+
sudo apt-get install less openssh-server
2622
- name: Installing scanning tool
2723
run: |
24+
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
25+
ln -s "$(which echo)" /usr/local/bin/say
2826
brew install git-secrets
2927
git secrets --install
30-
git secrets --register-aws
28+
git secrets --register-aws
3129
- name: Running scanning tool
3230
run:
33-
git secrets --scan
31+
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
32+
git secrets --scan

README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This appender uses [LogzioSender](https://github.com/logzio/logzio-java-sender)
1313
<dependency>
1414
<groupId>io.logz.log4j2</groupId>
1515
<artifactId>logzio-log4j2-appender</artifactId>
16-
<version>1.0.17</version>
16+
<version>1.0.18</version>
1717
</dependency>
1818
```
1919
The appender also requires a logger implementation, for example:
@@ -146,6 +146,8 @@ Will send a log to Logz.io that looks like this:
146146
```
147147

148148
### Release notes
149+
- 1.0.18
150+
- updated logzio sender version, fixing IndexOutOfBounds exception with bigqueue
149151
- 1.0.16
150152
- Added exceedMaxSizeAction parameter for handling oversized logs.
151153
- 1.0.15

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</scm>
3737

3838
<properties>
39-
<logzio-sender-version>1.1.5</logzio-sender-version>
39+
<logzio-sender-version>1.1.7</logzio-sender-version>
4040
</properties>
4141

4242
<build>

src/main/java/io/logz/log4j2/LogzioAppender.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.logz.log4j2;
22

33
import java.io.File;
4+
import java.io.IOException;
45
import java.net.InetAddress;
56
import java.net.UnknownHostException;
67
import java.util.Arrays;
@@ -14,6 +15,7 @@
1415
import java.util.concurrent.TimeUnit;
1516
import java.util.function.Supplier;
1617

18+
import com.google.common.base.Throwables;
1719
import org.apache.logging.log4j.Logger;
1820
import org.apache.logging.log4j.Marker;
1921
import org.apache.logging.log4j.core.Appender;
@@ -33,7 +35,6 @@
3335
import io.logz.sender.HttpsRequestConfiguration;
3436
import io.logz.sender.LogzioSender;
3537
import io.logz.sender.SenderStatusReporter;
36-
import io.logz.sender.com.google.common.base.Throwables;
3738
import io.logz.sender.com.google.gson.JsonObject;
3839
import io.logz.sender.exceptions.LogzioParameterErrorException;
3940

@@ -377,7 +378,7 @@ public void start() {
377378
}
378379
try {
379380
logzioSender = logzioSenderBuilder.build();
380-
} catch (LogzioParameterErrorException e) {
381+
} catch (LogzioParameterErrorException | IOException e) {
381382
statusLogger.error("Couldn't build logzio sender: " + e.getMessage(), e);
382383
return;
383384
}

0 commit comments

Comments
 (0)