Commit c3a31b3 1 parent b7ecd73 commit c3a31b3 Copy full SHA for c3a31b3
File tree 4 files changed +31
-5
lines changed
4 files changed +31
-5
lines changed Original file line number Diff line number Diff line change
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
+ }
Original file line number Diff line number Diff line change 1
1
module okio {
2
- requires java .logging ;
3
2
requires kotlin .stdlib ;
4
3
5
4
exports okio ;
Original file line number Diff line number Diff line change
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
+ }
Original file line number Diff line number Diff line change @@ -32,11 +32,10 @@ import java.nio.file.Files
32
32
import java.nio.file.OpenOption
33
33
import java.nio.file.Path as NioPath
34
34
import java.security.MessageDigest
35
- import java.util.logging.Level
36
- import java.util.logging.Logger
37
35
import javax.crypto.Cipher
38
36
import javax.crypto.Mac
39
37
import okio.internal.ResourceFileSystem
38
+ import okio.internal.Logger
40
39
41
40
/* * Returns a sink that writes to `out`. */
42
41
fun OutputStream.sink (): Sink = OutputStreamSink (this , Timeout ())
@@ -154,12 +153,12 @@ private class SocketAsyncTimeout(private val socket: Socket) : AsyncTimeout() {
154
153
try {
155
154
socket.close()
156
155
} 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)
158
157
} catch (e: AssertionError ) {
159
158
if (e.isAndroidGetsocknameError) {
160
159
// Catch this exception due to a Firmware issue up to android 4.2.2
161
160
// 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)
163
162
} else {
164
163
throw e
165
164
}
You can’t perform that action at this time.
0 commit comments