joerg/systemd-journal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changes for journal entry

Browse source
This commit is contained in:
Jörg Prante 2020-03-20 14:19:05 +01:00
parent bc1110058d
commit 422641ab1d
5 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,5 @@
#Mon Jul 29 11:55:05 CEST 2019 #Thu Mar 19 17:07:57 CET 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

6
gradlew vendored
View file

@ -7,7 +7,7 @@
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # https://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
@ -125,8 +125,8 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi fi
# For Cygwin, switch paths to Windows format before running java # For Cygwin or MSYS, switch paths to Windows format before running java
if $cygwin ; then if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"` APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"` JAVACMD=`cygpath --unix "$JAVACMD"`

2
gradlew.bat vendored
View file

@ -5,7 +5,7 @@
@rem you may not use this file except in compliance with the License. @rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at @rem You may obtain a copy of the License at
@rem @rem
@rem http://www.apache.org/licenses/LICENSE-2.0 @rem https://www.apache.org/licenses/LICENSE-2.0
@rem @rem
@rem Unless required by applicable law or agreed to in writing, software @rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS, @rem distributed under the License is distributed on an "AS IS" BASIS,

7
src/main/java/org/xbib/systemd/DefaultJournalEntry.java
View file

@ -416,11 +416,6 @@ public class DefaultJournalEntry implements JournalEntry {
@Override @Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(); return "priority=" + this.priority + ",message=" + this.message;
sb.append("priority=")
.append(this.priority)
.append(",message=")
.append(this.message);
return sb.toString();
} }
} }

3
src/main/java/org/xbib/systemd/SystemdJournalConsumer.java
View file

@ -102,7 +102,6 @@ public class SystemdJournalConsumer implements Runnable {
private JournalEntry makeEntry(List<String> list) { private JournalEntry makeEntry(List<String> list) {
DefaultJournalEntry journalEntry = new DefaultJournalEntry(); DefaultJournalEntry journalEntry = new DefaultJournalEntry();
for (String string : list) { for (String string : list) {
logger.log(Level.INFO, "entry: " + string);
if (string.startsWith("MESSAGE=")) { if (string.startsWith("MESSAGE=")) {
journalEntry.setMessage(string.substring(8)); journalEntry.setMessage(string.substring(8));
continue; continue;
@ -197,9 +196,7 @@ public class SystemdJournalConsumer implements Runnable {
} }
if (string.startsWith("_SYSTEMD_USER_UNIT=")) { if (string.startsWith("_SYSTEMD_USER_UNIT=")) {
journalEntry.setSystemdUserUnit(string.substring(18)); journalEntry.setSystemdUserUnit(string.substring(18));
continue;
} }
} }
return journalEntry; return journalEntry;
} }