diff options
3 files changed, 6 insertions, 6 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogHandler.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogHandler.java index b7993de5d82..48fdb2a0293 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogHandler.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogHandler.java @@ -130,7 +130,7 @@ class OsgiLogHandler extends Handler { case SOURCE_METHOD_NAME: return record.getSourceMethodName(); case THREAD_ID: - return record.getThreadID(); + return record.getLongThreadID(); case THROWN: return record.getThrown(); default: diff --git a/vespalog/src/test/java/com/yahoo/log/LogSetupTestCase.java b/vespalog/src/test/java/com/yahoo/log/LogSetupTestCase.java index 354892e7d37..0d2c2adf920 100644 --- a/vespalog/src/test/java/com/yahoo/log/LogSetupTestCase.java +++ b/vespalog/src/test/java/com/yahoo/log/LogSetupTestCase.java @@ -61,7 +61,7 @@ public class LogSetupTestCase { + hostname + "\t" + pid - + "/" + zookeeperLogRecord.getThreadID() + "\t-\t.org.apache.zookeeper.server.NIOServerCnxn" + + "/" + zookeeperLogRecord.getLongThreadID() + "\t-\t.org.apache.zookeeper.server.NIOServerCnxn" + "\twarning\tzookeeper log record"; zookeeperLogRecordError = new LogRecord(Level.SEVERE, "zookeeper error"); diff --git a/vespalog/src/test/java/com/yahoo/log/VespaLogHandlerTestCase.java b/vespalog/src/test/java/com/yahoo/log/VespaLogHandlerTestCase.java index 77d7fa66bb6..64aec98eca2 100644 --- a/vespalog/src/test/java/com/yahoo/log/VespaLogHandlerTestCase.java +++ b/vespalog/src/test/java/com/yahoo/log/VespaLogHandlerTestCase.java @@ -60,7 +60,7 @@ public class VespaLogHandlerTestCase { + "\t" + pid + "/" - + record1.getThreadID() + + record1.getLongThreadID() + "\tmy-test-config-id\tTST\tinfo\tThis is a test"; record2 = new LogRecord(Level.FINE, "This is a test too"); @@ -70,7 +70,7 @@ public class VespaLogHandlerTestCase { + hostname + "\t" + pid - + "/" + record2.getThreadID() + "\tmy-test-config-id\tTST.com.yahoo.log.test\tdebug\tThis is a test too"; + + "/" + record2.getLongThreadID() + "\tmy-test-config-id\tTST.com.yahoo.log.test\tdebug\tThis is a test too"; record3 = new LogRecord(Level.WARNING, "another test"); record3.setLoggerName("com.yahoo.log.test"); @@ -79,7 +79,7 @@ public class VespaLogHandlerTestCase { + hostname + "\t" + pid - + "/" + record3.getThreadID() + "\tmy-test-config-id\tTST.com.yahoo.log.test" + + "/" + record3.getLongThreadID() + "\tmy-test-config-id\tTST.com.yahoo.log.test" + "\twarning\tanother test"; record4 = new LogRecord(Level.WARNING, "unicode \u00E6\u00F8\u00E5 test \u7881 unicode"); @@ -89,7 +89,7 @@ public class VespaLogHandlerTestCase { + hostname + "\t" + pid - + "/" + record4.getThreadID() + "\tmy-test-config-id\tTST.com.yahoo.log.test" + + "/" + record4.getLongThreadID() + "\tmy-test-config-id\tTST.com.yahoo.log.test" + "\twarning\tunicode \u00E6\u00F8\u00E5 test \u7881 unicode"; } |