Skip to content

Commit 877af3a

Browse files
knowledgecodeknowledgecode
committed
Logging support
1 parent ac6ec32 commit 877af3a

File tree

4 files changed

+63
-95
lines changed

4 files changed

+63
-95
lines changed

‎plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<source-file src="src/android/org/eclipse/jetty/util/component/AggregateLifeCycle.java" target-dir="src/org/eclipse/jetty/util/component" />
8282
<source-file src="src/android/org/eclipse/jetty/util/component/Dumpable.java" target-dir="src/org/eclipse/jetty/util/component" />
8383
<source-file src="src/android/org/eclipse/jetty/util/component/LifeCycle.java" target-dir="src/org/eclipse/jetty/util/component" />
84-
<!-- <source-file src="src/android/org/eclipse/jetty/util/log/AndroidLogger.java" target-dir="src/org/eclipse/jetty/util/log" /> -->
84+
<source-file src="src/android/org/eclipse/jetty/util/log/AndroidLog.java" target-dir="src/org/eclipse/jetty/util/log" />
8585
<source-file src="src/android/org/eclipse/jetty/util/log/Log.java" target-dir="src/org/eclipse/jetty/util/log" />
8686
<source-file src="src/android/org/eclipse/jetty/util/log/Logger.java" target-dir="src/org/eclipse/jetty/util/log" />
8787
<source-file src="src/android/org/eclipse/jetty/util/resource/Resource.java" target-dir="src/org/eclipse/jetty/util/resource" />

‎src/android/com/knowledgecode/cordova/websocket/WebSocket.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@
2222
import java.util.concurrent.Executors;
2323
import java.util.concurrent.TimeUnit;
2424

25+
import org.apache.cordova.CordovaPreferences;
2526
import org.apache.cordova.CordovaWebView;
2627
import org.apache.cordova.CallbackContext;
2728
import org.apache.cordova.CordovaInterface;
2829
import org.apache.cordova.CordovaPlugin;
30+
import org.eclipse.jetty.util.log.Log;
2931
import org.eclipse.jetty.websocket.WebSocket.Connection;
3032
import org.eclipse.jetty.websocket.WebSocketClientFactory;
3133

@@ -64,6 +66,7 @@ public void initialize(CordovaInterface cordova, final CordovaWebView webView) {
6466
_runner.setTask(RESET_TASK, new ResetTask(_conn));
6567
_runner.setTask(DESTROY_TASK, new DestroyTask(_factory, _conn));
6668
_executor.execute(_runner);
69+
Log.setLogLevel(getLogLevel(this.preferences));
6770
}
6871

6972
@Override
@@ -87,4 +90,20 @@ public void onDestroy() {
8790
}
8891
super.onDestroy();
8992
}
93+
94+
private static int getLogLevel(CordovaPreferences preferences) {
95+
String logLevel = preferences.getString("LogLevel", "ERROR");
96+
97+
if ("VERBOSE".equals(logLevel)) {
98+
return android.util.Log.VERBOSE;
99+
} else if ("DEBUG".equals(logLevel)) {
100+
return android.util.Log.DEBUG;
101+
} else if ("INFO".equals(logLevel)) {
102+
return android.util.Log.INFO;
103+
} else if ("WARN".equals(logLevel)) {
104+
return android.util.Log.WARN;
105+
} else {
106+
return android.util.Log.ERROR;
107+
}
108+
}
90109
}

‎src/android/org/eclipse/jetty/util/log/AndroidLogger.java renamed to ‎src/android/org/eclipse/jetty/util/log/AndroidLog.java

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,15 @@
1919
package org.eclipse.jetty.util.log;
2020

2121
/**
22-
* Logger for Android
22+
* A logger implementation for Android
2323
*
2424
* Copyright (c) 2015 KNOWLEDGECODE
2525
*/
26-
class AndroidLogger implements Logger {
26+
final class AndroidLog implements Logger {
2727

2828
private String _tag;
2929

30-
AndroidLogger() {
31-
}
32-
33-
private AndroidLogger(String tag) {
30+
AndroidLog(String tag) {
3431
_tag = tag.substring(tag.length() > 23 ? tag.length() - 23 : 0);
3532
}
3633

@@ -40,37 +37,49 @@ private static String format(String msg, Object... args) {
4037

4138
@Override
4239
public String getName() {
43-
return AndroidLogger.class.getName();
40+
return AndroidLog.class.getName();
4441
}
4542

4643
@Override
4744
public void warn(String msg, Object... args) {
48-
android.util.Log.w(_tag, format(msg, args));
45+
if (Log.logLevel <= android.util.Log.WARN) {
46+
android.util.Log.w(_tag, format(msg, args));
47+
}
4948
}
5049

5150
@Override
5251
public void warn(Throwable thrown) {
53-
android.util.Log.w(_tag, thrown);
52+
if (Log.logLevel <= android.util.Log.WARN) {
53+
android.util.Log.w(_tag, thrown);
54+
}
5455
}
5556

5657
@Override
5758
public void warn(String msg, Throwable thrown) {
58-
android.util.Log.w(_tag, msg, thrown);
59+
if (Log.logLevel <= android.util.Log.WARN) {
60+
android.util.Log.w(_tag, msg, thrown);
61+
}
5962
}
6063

6164
@Override
6265
public void info(String msg, Object... args) {
63-
android.util.Log.i(_tag, format(msg, args));
66+
if (Log.logLevel <= android.util.Log.INFO) {
67+
android.util.Log.i(_tag, format(msg, args));
68+
}
6469
}
6570

6671
@Override
6772
public void info(Throwable thrown) {
68-
android.util.Log.i(_tag, "", thrown);
73+
if (Log.logLevel <= android.util.Log.INFO) {
74+
android.util.Log.i(_tag, "", thrown);
75+
}
6976
}
7077

7178
@Override
7279
public void info(String msg, Throwable thrown) {
73-
android.util.Log.i(_tag, msg, thrown);
80+
if (Log.logLevel <= android.util.Log.INFO) {
81+
android.util.Log.i(_tag, msg, thrown);
82+
}
7483
}
7584

7685
@Override
@@ -85,22 +94,28 @@ public void setDebugEnabled(boolean enabled) {
8594

8695
@Override
8796
public void debug(String msg, Object... args) {
88-
android.util.Log.d(_tag, format(msg, args));
97+
if (Log.logLevel <= android.util.Log.DEBUG) {
98+
android.util.Log.d(_tag, format(msg, args));
99+
}
89100
}
90101

91102
@Override
92103
public void debug(Throwable thrown) {
93-
android.util.Log.d(_tag, "", thrown);
104+
if (Log.logLevel <= android.util.Log.DEBUG) {
105+
android.util.Log.d(_tag, "", thrown);
106+
}
94107
}
95108

96109
@Override
97110
public void debug(String msg, Throwable thrown) {
98-
android.util.Log.d(_tag, msg, thrown);
111+
if (Log.logLevel <= android.util.Log.DEBUG) {
112+
android.util.Log.d(_tag, msg, thrown);
113+
}
99114
}
100115

101116
@Override
102117
public Logger getLogger(String tag) {
103-
return new AndroidLogger(tag);
118+
throw new UnsupportedOperationException();
104119
}
105120

106121
@Override

‎src/android/org/eclipse/jetty/util/log/Log.java

Lines changed: 11 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -26,83 +26,8 @@
2626
public class Log
2727
{
2828
public static final String EXCEPTION = "EXCEPTION ";
29-
public static final String IGNORED = "IGNORED ";
3029

31-
private static Logger LOG = new Logger()
32-
{
33-
@Override
34-
public String getName()
35-
{
36-
return null;
37-
}
38-
39-
@Override
40-
public void warn(String msg, Object... args)
41-
{
42-
}
43-
44-
@Override
45-
public void warn(Throwable thrown)
46-
{
47-
}
48-
49-
@Override
50-
public void warn(String msg, Throwable thrown)
51-
{
52-
}
53-
54-
@Override
55-
public void info(String msg, Object... args)
56-
{
57-
}
58-
59-
@Override
60-
public void info(Throwable thrown)
61-
{
62-
}
63-
64-
@Override
65-
public void info(String msg, Throwable thrown)
66-
{
67-
}
68-
69-
@Override
70-
public boolean isDebugEnabled()
71-
{
72-
return false;
73-
}
74-
75-
@Override
76-
public void setDebugEnabled(boolean enabled)
77-
{
78-
}
79-
80-
@Override
81-
public void debug(String msg, Object... args)
82-
{
83-
}
84-
85-
@Override
86-
public void debug(Throwable thrown)
87-
{
88-
}
89-
90-
@Override
91-
public void debug(String msg, Throwable thrown)
92-
{
93-
}
94-
95-
@Override
96-
public Logger getLogger(String name)
97-
{
98-
return this;
99-
}
100-
101-
@Override
102-
public void ignore(Throwable ignored)
103-
{
104-
}
105-
};
30+
static int logLevel = android.util.Log.ERROR;
10631

10732
/**
10833
* Obtain a named Logger based on the fully qualified class name.
@@ -123,6 +48,15 @@ public static Logger getLogger(Class<?> clazz)
12348
*/
12449
public static Logger getLogger(String name)
12550
{
126-
return LOG.getLogger(name);
51+
return new AndroidLog(name == null ? "" : name);
52+
}
53+
54+
/**
55+
* Change log level.
56+
* @param level
57+
*/
58+
public static void setLogLevel(int level)
59+
{
60+
logLevel = level;
12761
}
12862
}

0 commit comments

Comments
 (0)