/hg/icedtea-web: Console made aware of plugin messages
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Sun Dec 15 02:00:33 PST 2013
changeset bb1f288a297a in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bb1f288a297a
author: Jiri Vanek <jvanek at redhat.com>
date: Sun Dec 15 11:07:05 2013 +0100
Console made aware of plugin messages
diffstat:
ChangeLog | 40 ++
NEWS | 1 +
netx/net/sourceforge/jnlp/util/logging/FileLog.java | 3 +-
netx/net/sourceforge/jnlp/util/logging/JavaConsole.java | 81 ++++-
netx/net/sourceforge/jnlp/util/logging/LogConfig.java | 11 +-
netx/net/sourceforge/jnlp/util/logging/OutputController.java | 115 ++----
netx/net/sourceforge/jnlp/util/logging/headers/Header.java | 161 ++++++++++
netx/net/sourceforge/jnlp/util/logging/headers/JavaMessage.java | 63 +++
netx/net/sourceforge/jnlp/util/logging/headers/MessageWithHeader.java | 46 ++
netx/net/sourceforge/jnlp/util/logging/headers/PluginHeader.java | 82 +++++
netx/net/sourceforge/jnlp/util/logging/headers/PluginMessage.java | 94 +++++
plugin/icedteanp/IcedTeaNPPlugin.cc | 153 +++++++++-
plugin/icedteanp/IcedTeaNPPlugin.h | 9 +
plugin/icedteanp/IcedTeaPluginUtils.cc | 33 +-
plugin/icedteanp/IcedTeaPluginUtils.h | 39 ++-
plugin/icedteanp/java/sun/applet/PluginMain.java | 17 +-
tests/netx/unit/net/sourceforge/jnlp/util/logging/JavaConsoleTest.java | 59 +++
17 files changed, 916 insertions(+), 91 deletions(-)
diffs (truncated from 1355 to 500 lines):
diff -r 48b7db08527c -r bb1f288a297a ChangeLog
--- a/ChangeLog Fri Dec 13 11:49:51 2013 +0100
+++ b/ChangeLog Sun Dec 15 11:07:05 2013 +0100
@@ -1,3 +1,43 @@
+2013-12-15 Jiri Vanek <jvanek at redhat.com>
+
+ Console made aware of plugin messages
+ * NEWS : mentioned
+ * netx/net/sourceforge/jnlp/util/logging/FileLog.java: call to log adapted
+ to new Header.
+ * netx/net/sourceforge/jnlp/util/logging/JavaConsole.java: (logOutput) and
+ (logError) replaced by (addMessage). Added (createPluginReader) to process
+ plugin debug pipe
+ * netx/net/sourceforge/jnlp/util/logging/LogConfig.java: (getConfig) do
+ config available untill JNLPRuntime config is proper singleton
+ * netx/net/sourceforge/jnlp/util/logging/OutputController.java: (Level)
+ static methods converted to members and enhanced. (getHeader) and
+ (getCallerClass) moved to Headers.
+ * netx/net/sourceforge/jnlp/util/logging/headers/Header.java: Structure
+ to keep header as object instead of string.
+ * netx/net/sourceforge/jnlp/util/logging/headers/JavaMessage.java: Structure
+ to hold message and its header.
+ * netx/net/sourceforge/jnlp/util/logging/headers/MessageWithHeader.java:
+ Interface for JavaMessage and PluginMessage
+ * netx/net/sourceforge/jnlp/util/logging/headers/PluginHeader.java: extended
+ header to handle plugin's preinit and threads.
+ * netx/net/sourceforge/jnlp/util/logging/headers/PluginMessage.java:
+ implementation of MessageWithHeader which parse from String from plugin
+ debug pipe.
+ * plugin/icedteanp/IcedTeaNPPlugin.cc: added debug pipe (debug_pipe_name),
+ synced via (debug_pipe_lock), controlled by (debug_to_appletviewer) and used
+ by method (plugin_send_message_to_appletviewer_console).
+ * plugin/icedteanp/IcedTeaNPPlugin.h: (debug_pipe_name) and (jvvm_up) declared
+ extern. Utility methods (plugin_send_message_to_appletviewer_console) and
+ (flush_plugin_send_message_to_appletviewer_console) declared and impelmented
+ * plugin/icedteanp/IcedTeaPluginUtils.cc: print debug info enhanced for
+ debug pipe
+ * plugin/icedteanp/IcedTeaPluginUtils.h: (PLUGIN_MESSAGE) and (PLIGIN_ERROR)
+ now log to debug pipe if enabled.
+ * plugin/icedteanp/java/sun/applet/PluginMain.java: args reprinted, checked
+ third parameter debug pipe if should. Started debug_pipe reader if should
+ * tests/netx/unit/net/sourceforge/jnlp/util/logging/JavaConsoleTest.java:
+ added tests for parsing the plugin message.
+
2013-12-13 Jiri Vanek <jvanek at redhat.com>
Made again compatible with JDK6.All JLists, JComboBoxs, and DefaultComboBoxModels
diff -r 48b7db08527c -r bb1f288a297a NEWS
--- a/NEWS Fri Dec 13 11:49:51 2013 +0100
+++ b/NEWS Sun Dec 15 11:07:05 2013 +0100
@@ -26,6 +26,7 @@
- PR1026 - Apps fail to run because of the nanoxml parser's strict XML validation
- PR1473 - javaws should not depend on name of local file
- Redesigned About dialogue layout and contents
+ - Console made aware of plugin messages
* Plugin
- PR854: Resizing an applet several times causes 100% CPU load
- PR1271: icedtea-web does not handle 'javascript:'-protocol URLs
diff -r 48b7db08527c -r bb1f288a297a netx/net/sourceforge/jnlp/util/logging/FileLog.java
--- a/netx/net/sourceforge/jnlp/util/logging/FileLog.java Fri Dec 13 11:49:51 2013 +0100
+++ b/netx/net/sourceforge/jnlp/util/logging/FileLog.java Sun Dec 15 11:07:05 2013 +0100
@@ -46,6 +46,7 @@
import java.util.logging.LogRecord;
import java.util.logging.Logger;
import net.sourceforge.jnlp.util.FileUtils;
+import net.sourceforge.jnlp.util.logging.headers.Header;
/**
* This class writes log information to file.
@@ -90,7 +91,7 @@
impl = Logger.getLogger(loggerName);
impl.setLevel(Level.ALL);
impl.addHandler(fh);
- log(OutputController.getHeader(null, null));
+ log(new Header(OutputController.Level.WARNING_ALL, Thread.currentThread().getStackTrace(), Thread.currentThread(), false).toString());
} catch (IOException e) {
throw new RuntimeException(e);
}
diff -r 48b7db08527c -r bb1f288a297a netx/net/sourceforge/jnlp/util/logging/JavaConsole.java
--- a/netx/net/sourceforge/jnlp/util/logging/JavaConsole.java Fri Dec 13 11:49:51 2013 +0100
+++ b/netx/net/sourceforge/jnlp/util/logging/JavaConsole.java Sun Dec 15 11:07:05 2013 +0100
@@ -46,6 +46,11 @@
import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
@@ -63,6 +68,10 @@
import net.sourceforge.jnlp.config.DeploymentConfiguration;
import net.sourceforge.jnlp.runtime.JNLPRuntime;
import net.sourceforge.jnlp.util.ImageResources;
+import net.sourceforge.jnlp.util.logging.headers.Header;
+import net.sourceforge.jnlp.util.logging.headers.JavaMessage;
+import net.sourceforge.jnlp.util.logging.headers.MessageWithHeader;
+import net.sourceforge.jnlp.util.logging.headers.PluginMessage;
/**
* A simple Java console for IcedTeaPlugin and JavaWS
@@ -392,7 +401,7 @@
final JavaConsole console = new JavaConsole();
- boolean toShowConsole = false;
+ boolean toShowConsole = true;
for (String arg : args) {
if ("--show-console".equals(arg)) {
@@ -406,11 +415,73 @@
}
- void logOutput(String s) {
- stdOutText.setText(stdOutText.getText() + s + "\n");
+
+ void addMessage(Header header, String message) {
+ if (!LogConfig.getLogConfig().isEnableHeaders()){
+ if (header.level.isError()){
+ stdErrText.setText(stdErrText.getText() + message + "\n");
+ }
+ if (header.level.isOutput()){
+ stdOutText.setText(stdOutText.getText() + message + "\n");
+ }
+ } else {
+ if (header.level.isError()){
+ stdErrText.setText(stdErrText.getText( )+ header.toString() + message +"\n");
+ }
+ if (header.level.isOutput()){
+ stdOutText.setText(stdOutText.getText() + header.toString() + message + "\n");
+ }
+ }
}
- void logError(String s) {
- stdErrText.setText(stdErrText.getText() + s + "\n");
+ /**
+ * parse plugin message and add it as header+message to data
+ * @param s string to be parsed
+ */
+ private void processPluginMessage(String s) {
+ PluginMessage pm = new PluginMessage(s);
+ addMessage(pm.getHeader(), pm.getMessage());
+ }
+
+
+ public void createPluginReader(final File file) {
+ OutputController.getLogger().log("Starting processing of plugin-debug-to-console " + file.getAbsolutePath());
+ Thread t = new Thread(new Runnable() {
+
+ @Override
+ public void run() {
+ BufferedReader br = null;
+ try {
+ br = new BufferedReader(new InputStreamReader(new FileInputStream(file),
+ Charset.forName("UTF-8")));
+ //never ending loop
+ while (true) {
+ try{
+ String s = br.readLine();
+ if (s == null) {
+ break;
+ }
+ processPluginMessage(s);
+ }catch(Exception ex){
+ OutputController.getLogger().log(ex);
+ }
+ }
+ } catch (Exception ex) {
+ OutputController.getLogger().log(ex);
+ if (br != null) {
+ try {
+ br.close();
+ } catch (Exception exx) {
+ OutputController.getLogger().log(exx);
+ }
+ }
+ }
+ OutputController.getLogger().log("Ended processing of plugin-debug-to-console " + file.getAbsolutePath());
+ }
+ }, "plugin-debug-to-console reader thread");
+ t.setDaemon(true);
+ t.start();
+
+ OutputController.getLogger().log("Started processing of plugin-debug-to-console " + file.getAbsolutePath());
}
}
diff -r 48b7db08527c -r bb1f288a297a netx/net/sourceforge/jnlp/util/logging/LogConfig.java
--- a/netx/net/sourceforge/jnlp/util/logging/LogConfig.java Fri Dec 13 11:49:51 2013 +0100
+++ b/netx/net/sourceforge/jnlp/util/logging/LogConfig.java Sun Dec 15 11:07:05 2013 +0100
@@ -55,12 +55,13 @@
private boolean logToFile;
private boolean logToStreams;
private boolean logToSysLog;
+ private DeploymentConfiguration config;
private static LogConfig logConfig;
public LogConfig() {
try {
- DeploymentConfiguration config = JNLPRuntime.getConfiguration();
+ config = JNLPRuntime.getConfiguration();
if (config.getRaw().isEmpty()){
config = new DeploymentConfiguration();//JNLPRuntime.getConfiguration() cannotbe loaded time
config.load(); //read one prior
@@ -161,7 +162,11 @@
return JavaConsole.isEnabled();
}
-
-
+ /*
+ * logging stuff may be interested in used config
+ */
+ public DeploymentConfiguration getConfig() {
+ return config;
+ }
}
diff -r 48b7db08527c -r bb1f288a297a netx/net/sourceforge/jnlp/util/logging/OutputController.java
--- a/netx/net/sourceforge/jnlp/util/logging/OutputController.java Fri Dec 13 11:49:51 2013 +0100
+++ b/netx/net/sourceforge/jnlp/util/logging/OutputController.java Sun Dec 15 11:07:05 2013 +0100
@@ -54,20 +54,37 @@
ERROR_ALL, // - stderr/log in all cases (default for
ERROR_DEBUG; // - stderr/log in verbose/debug mode
//ERROR_DEBUG is default for Throwable
- //MESSAGE_VERBOSE is defautrl for String
+ //MESSAGE_DEBUG is default for String
- private static boolean isOutput(MessageWithLevel s) {
- return s.level == Level.MESSAGE_ALL
- || s.level == Level.MESSAGE_DEBUG
- || s.level == Level.WARNING_ALL
- || s.level == Level.WARNING_DEBUG;
+ public boolean isOutput() {
+ return this == Level.MESSAGE_ALL
+ || this == Level.MESSAGE_DEBUG
+ || this == Level.WARNING_ALL
+ || this == Level.WARNING_DEBUG;
}
- private static boolean isError(MessageWithLevel s) {
- return s.level == Level.ERROR_ALL
- || s.level == Level.ERROR_DEBUG
- || s.level == Level.WARNING_ALL
- || s.level == Level.WARNING_DEBUG;
+ public boolean isError() {
+ return this == Level.ERROR_ALL
+ || this == Level.ERROR_DEBUG
+ || this == Level.WARNING_ALL
+ || this == Level.WARNING_DEBUG;
+ }
+
+ public boolean isWarning() {
+ return this == Level.WARNING_ALL
+ || this == Level.WARNING_DEBUG;
+ }
+
+ public boolean isDebug() {
+ return this == Level.ERROR_DEBUG
+ || this == Level.MESSAGE_DEBUG
+ || this == Level.WARNING_DEBUG;
+ }
+
+ public boolean isInfo() {
+ return this == Level.ERROR_ALL
+ || this == Level.WARNING_ALL
+ || this == Level.MESSAGE_ALL;
}
}
@@ -76,6 +93,8 @@
public final String message;
public final Level level;
public final StackTraceElement[] stack = Thread.currentThread().getStackTrace();
+ public final Thread thread = Thread.currentThread();
+ public final Date loggedAt = new Date();
public MessageWithLevel(String message, Level level) {
this.message = message;
@@ -132,6 +151,11 @@
private void consume() {
MessageWithLevel s = messageQue.get(0);
messageQue.remove(0);
+ net.sourceforge.jnlp.util.logging.headers.Header header = new net.sourceforge.jnlp.util.logging.headers.Header(s.level, s.stack, s.thread, s.loggedAt, false);
+ //filtering is done in console during runtime
+ if (LogConfig.getLogConfig().isLogToConsole()) {
+ JavaConsole.getConsole().addMessage(header, s.message);
+ }
if (!JNLPRuntime.isDebug() && (s.level == Level.MESSAGE_DEBUG
|| s.level == Level.WARNING_DEBUG
|| s.level == Level.ERROR_DEBUG)) {
@@ -142,16 +166,16 @@
String message = s.message;
if (LogConfig.getLogConfig().isEnableHeaders()) {
if (message.contains("\n")) {
- message = getHeader(s.level, s.stack) + "\n" + message;
+ message = header.toString() + "\n" + message;
} else {
- message = getHeader(s.level, s.stack) + " " + message;
+ message = header.toString() + " " + message;
}
}
if (LogConfig.getLogConfig().isLogToStreams()) {
- if (Level.isOutput(s)) {
+ if (s.level.isOutput()) {
outLog.log(message);
}
- if (Level.isError(s)) {
+ if (s.level.isError()) {
errLog.log(message);
}
}
@@ -161,14 +185,6 @@
if (LogConfig.getLogConfig().isLogToSysLog()) {
getSystemLog().log(message);
}
- if (LogConfig.getLogConfig().isLogToConsole()) {
- if (Level.isOutput(s)){
- JavaConsole.getConsole().logOutput(message);
- }
- if (Level.isError(s)){
- JavaConsole.getConsole().logError(message);
- }
- }
}
@@ -344,59 +360,6 @@
printOut(e);
printError(e);
}
-
- public static String getHeader(Level level, StackTraceElement[] stack) {
- StringBuilder sb = new StringBuilder();
- try {
- String user = System.getProperty("user.name");
- sb.append("[").append(user).append("]");
- if (JNLPRuntime.isWebstartApplication()) {
- sb.append("[ITW-JAVAWS]");
- } else {
- sb.append("[ITW]");
- }
- if (level != null) {
- sb.append('[').append(level.toString()).append(']');
- }
- sb.append('[').append(new Date().toString()).append(']');
- if (stack != null) {
- sb.append('[').append(getCallerClass(stack)).append(']');
- }
- sb.append(" NETX Thread# ")
- .append(Integer.toHexString(((Object)Thread.currentThread()).hashCode()))
- .append(", name ")
- .append(Thread.currentThread().getName());
- } catch (Exception ex) {
- getLogger().log(ex);
- }
- return sb.toString();
-
- }
-
- static String getCallerClass(StackTraceElement[] stack) {
- try {
- //0 is always thread
- //1..? is OutputController itself
- //pick up first after.
- StackTraceElement result = stack[0];
- int i = 1;
- for (; i < stack.length; i++) {
- result = stack[i];//at least moving up
- if (stack[i].getClassName().contains(OutputController.class.getName()) ||
- //PluginDebug.class.getName() not avaiable during netx make
- stack[i].getClassName().contains("sun.applet.PluginDebug") ) {
- continue;
- } else {
- break;
- }
- }
- return result.toString();
- } catch (Exception ex) {
- getLogger().log(ex);
- return "Unknown caller";
- }
- }
-
//package private setters for testing
diff -r 48b7db08527c -r bb1f288a297a netx/net/sourceforge/jnlp/util/logging/headers/Header.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/util/logging/headers/Header.java Sun Dec 15 11:07:05 2013 +0100
@@ -0,0 +1,161 @@
+/*
+Copyright (C) 2009, 2013 Red Hat
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+package net.sourceforge.jnlp.util.logging.headers;
+
+import java.util.Date;
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
+import net.sourceforge.jnlp.util.logging.OutputController;
+import net.sourceforge.jnlp.util.logging.OutputController.Level;
+
+public class Header {
+
+ public String user;
+ public boolean application;
+ public Level level;
+ public Date date = new Date();
+ public boolean isC;//false=> java
+ public String caller;
+ public String thread1;
+ public String thread2;
+
+ //to alow simple inheritance
+ public Header() {
+ }
+
+ public Header(Level level, StackTraceElement[] stack, Thread thread, boolean isC) {
+ this(level, stack, thread, new Date(), isC);
+ }
+
+ public Header(Level level, StackTraceElement[] stack, Thread thread, Date d, boolean isC) {
+ this.user = System.getProperty("user.name");
+ this.application = JNLPRuntime.isWebstartApplication();
+ this.level = level;
+ this.date = d;
+ this.isC = isC;
+ if (stack != null) {
+ this.caller = getCallerClass(stack);
+ }
+ this.thread1 = Integer.toHexString(((Object) thread).hashCode());
+ this.thread2 = thread.getName();
+ }
+
+ @Override
+ public String toString() {
+ return toString(true, true, true, true, true, true, true);
+ }
+
+ public String toString(boolean userb, boolean originb, boolean levelb, boolean dateb, boolean callerb, boolean thread1b, boolean thread2b) {
+ StringBuilder sb = new StringBuilder();
+ try {
+ if (userb){
+ sb.append("[").append(user).append("]");
+ }
+ if(originb){
+ sb.append("[").append(getOrigin()).append("]");
+ }
+
+ if (levelb && level != null) {
+ sb.append('[').append(level.toString()).append(']');
+ }
+ if (dateb){
+ sb.append('[').append(date.toString()).append(']');
+ }
+ if (callerb && caller != null) {
+ sb.append('[').append(caller).append(']');
+ }
+ if (thread1b && thread2b){
+ sb.append(threadsToString());
+ }else if (thread1b) {
+ sb.append(thread1ToString());
+ }else if (thread2b) {
More information about the distro-pkg-dev
mailing list