Skip to content

Commit

Permalink
Update sender dependency (#50)
Browse files Browse the repository at this point in the history
* updated sender version

* fix git secrets workflow
  • Loading branch information
tamir-michaeli authored Dec 4, 2022
1 parent 04ee7f9 commit 90df7c7
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 14 deletions.
19 changes: 9 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,32 @@
name: git-secrets

# Controls when the workflow will run
# Triggers the workflow on push or pull request events but only for the main branch
on: [push]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "main"
git-secrets:
# The type of runner that the job will run on
runs-on: ubuntu-18.04

runs-on: ubuntu-22.04
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Check Out Source Code
uses: actions/checkout@v2

uses: actions/checkout@v3
- name: Set up Python 3.8
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.8
- name: Installing dependencies
run:
sudo apt-get install git less openssh-server
sudo apt-get install less openssh-server
- name: Installing scanning tool
run: |
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
ln -s "$(which echo)" /usr/local/bin/say
brew install git-secrets
git secrets --install
git secrets --register-aws
git secrets --register-aws
- name: Running scanning tool
run:
git secrets --scan
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
git secrets --scan
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This appender uses [LogzioSender](https://github.com/logzio/logzio-java-sender)
<dependency>
<groupId>io.logz.log4j2</groupId>
<artifactId>logzio-log4j2-appender</artifactId>
<version>1.0.17</version>
<version>1.0.18</version>
</dependency>
```
The appender also requires a logger implementation, for example:
Expand Down Expand Up @@ -146,6 +146,8 @@ Will send a log to Logz.io that looks like this:
```

### Release notes
- 1.0.18
- updated logzio sender version, fixing IndexOutOfBounds exception with bigqueue
- 1.0.16
- Added exceedMaxSizeAction parameter for handling oversized logs.
- 1.0.15
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</scm>

<properties>
<logzio-sender-version>1.1.5</logzio-sender-version>
<logzio-sender-version>1.1.7</logzio-sender-version>
</properties>

<build>
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/io/logz/log4j2/LogzioAppender.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.logz.log4j2;

import java.io.File;
import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Arrays;
Expand All @@ -14,6 +15,7 @@
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;

import com.google.common.base.Throwables;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.core.Appender;
Expand All @@ -33,7 +35,6 @@
import io.logz.sender.HttpsRequestConfiguration;
import io.logz.sender.LogzioSender;
import io.logz.sender.SenderStatusReporter;
import io.logz.sender.com.google.common.base.Throwables;
import io.logz.sender.com.google.gson.JsonObject;
import io.logz.sender.exceptions.LogzioParameterErrorException;

Expand Down Expand Up @@ -377,7 +378,7 @@ public void start() {
}
try {
logzioSender = logzioSenderBuilder.build();
} catch (LogzioParameterErrorException e) {
} catch (LogzioParameterErrorException | IOException e) {
statusLogger.error("Couldn't build logzio sender: " + e.getMessage(), e);
return;
}
Expand Down

0 comments on commit 90df7c7

Please sign in to comment.