Skip to content

Commit c3a31b3

Browse files
committed
Avoid jul.Logger on java > 8
1 parent b7ecd73 commit c3a31b3

File tree

4 files changed

+31
-5
lines changed

4 files changed

+31
-5
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package okio.internal;
2+
3+
public class Logger {
4+
private final java.util.logging.Logger logger;
5+
private Logger(String name) {
6+
this.logger = java.util.logging.Logger.getLogger(name);
7+
}
8+
public static Logger getLogger(String name) {
9+
return new Logger(name);
10+
}
11+
public void warn(String msg, Throwable e) {
12+
logger.log(java.util.logging.Level.WARNING, msg, e);
13+
}
14+
}

okio/src/jvmMain/java9/module-info.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
module okio {
2-
requires java.logging;
32
requires kotlin.stdlib;
43

54
exports okio;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package okio.internal;
2+
3+
public class Logger {
4+
private final System.Logger logger;
5+
private Logger(String name) {
6+
this.logger = System.getLogger(name);
7+
}
8+
public static Logger getLogger(String name) {
9+
return new Logger(name);
10+
}
11+
public void warn(String msg, Throwable e) {
12+
logger.log(System.Logger.Level.WARNING, msg, e);
13+
}
14+
}

okio/src/jvmMain/kotlin/okio/JvmOkio.kt

+3-4
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,10 @@ import java.nio.file.Files
3232
import java.nio.file.OpenOption
3333
import java.nio.file.Path as NioPath
3434
import java.security.MessageDigest
35-
import java.util.logging.Level
36-
import java.util.logging.Logger
3735
import javax.crypto.Cipher
3836
import javax.crypto.Mac
3937
import okio.internal.ResourceFileSystem
38+
import okio.internal.Logger
4039

4140
/** Returns a sink that writes to `out`. */
4241
fun OutputStream.sink(): Sink = OutputStreamSink(this, Timeout())
@@ -154,12 +153,12 @@ private class SocketAsyncTimeout(private val socket: Socket) : AsyncTimeout() {
154153
try {
155154
socket.close()
156155
} catch (e: Exception) {
157-
logger.log(Level.WARNING, "Failed to close timed out socket $socket", e)
156+
logger.warn("Failed to close timed out socket $socket", e)
158157
} catch (e: AssertionError) {
159158
if (e.isAndroidGetsocknameError) {
160159
// Catch this exception due to a Firmware issue up to android 4.2.2
161160
// https://code.google.com/p/android/issues/detail?id=54072
162-
logger.log(Level.WARNING, "Failed to close timed out socket $socket", e)
161+
logger.warn("Failed to close timed out socket $socket", e)
163162
} else {
164163
throw e
165164
}

0 commit comments

Comments
 (0)