midsuit
/
core-jgi
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BF [2749008 ] Error in Task Management from webui 

* Task should stop if desktop is no longer available.
* Reduce logging level from WARNING and SEVERE to FINE, too verbose.
* OSTask.java - display exception to client.
This commit is contained in:
Heng Sin Low 2009-04-22 09:35:49 +00:00
parent 1a2dd723b2
commit 0da67d98e8
2 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zkwebui/WEB-INF/src/org/adempiere/webui/util/OSTask.java
View File

@ -50,7 +50,7 @@ public class OSTask extends Thread
/** Logger */
private static CLogger log = CLogger.getCLogger(OSTask.class);
/** Read Out */
private Thread m_outReader = new Thread()
{
@ -116,9 +116,9 @@ public class OSTask extends Thread
return;
m_outReader.start();
m_errReader.start();
Integer exitValue = null;
while(exitValue == null)
while(exitValue == null)
{
//
try
@ -140,6 +140,7 @@ public class OSTask extends Thread
catch (IOException ioe)
{
log.log(Level.SEVERE, "(ioe)", ioe);
m_err.append(ioe.getLocalizedMessage());
}
} // run
@ -204,5 +205,5 @@ public class OSTask extends Thread
{
return m_inStream;
} // getInStream
} // Task

46
zkwebui/WEB-INF/src/org/adempiere/webui/window/WTask.java
View File

@ -43,13 +43,13 @@ import org.zkoss.zul.Html;
*
* @author Jorg Janke
* @version $Id: ATask.java,v 1.2 2006/07/30 00:51:27 jjanke Exp $
*
*
* @author Low Heng Sin
*/
public class WTask extends Window implements EventListener
{
/**
*
*
*/
private static final long serialVersionUID = -1235619876719378703L;
@ -67,7 +67,7 @@ public class WTask extends Window implements EventListener
private Thread taskThread;
/**************************************************************************
* Full Constructor
* @param title title
@ -80,18 +80,18 @@ public class WTask extends Window implements EventListener
try
{
zkInit();
setAttribute(Window.MODE_KEY, Window.MODE_EMBEDDED);
setAttribute(Window.MODE_KEY, Window.MODE_EMBEDDED);
//
m_task = task;
if (task.isServerProcess())
info.setContent("Executing on Server ...");
else
info.setContent("Executing locally ...");
SessionManager.getAppDesktop().showWindow(this);
Events.echoEvent("executeTask", this, null);
Events.echoEvent("executeTask", this, null);
}
catch(Exception e)
{
@ -108,20 +108,20 @@ public class WTask extends Window implements EventListener
String cmd = Msg.parseTranslation(Env.getCtx(), m_task.getOS_Command()).trim();
if (cmd == null || cmd.equals(""))
info.setContent("Cannot execute '" + m_task.getOS_Command() + "'");
OSTask osTask = new OSTask(cmd);
OSTask osTask = new OSTask(cmd);
osTask.start();
while (true) {
while (true) {
try {
Thread.sleep(500);
Executions.activate(desktop);
try {
try {
StringBuffer sb = new StringBuffer();
sb.append(osTask.getOut())
.append("<br>-----------<br>")
.append(osTask.getErr())
.append("<br>-----------");
info.setContent(sb.toString().replace("\n", "<br>"));
if (!osTask.isAlive())
{
@ -134,14 +134,16 @@ public class WTask extends Window implements EventListener
Executions.deactivate(desktop);
}
} catch (DesktopUnavailableException e) {
log.log(Level.SEVERE, e.getLocalizedMessage(), e);
} catch (InterruptedException e) {
log.log(Level.WARNING, e.getLocalizedMessage(), e);
log.log(Level.FINE, e.getLocalizedMessage(), e);
osTask.interrupt();
break;
}
} catch (InterruptedException e) {
log.log(Level.FINE, e.getLocalizedMessage(), e);
osTask.interrupt();
break;
}
}
}
}
};
taskThread = new Thread(runnable);
taskThread.start();
@ -173,15 +175,15 @@ public class WTask extends Window implements EventListener
div.appendChild(info);
center.appendChild(div);
center.setFlex(true);
South south = new South();
layout.appendChild(south);
south.setStyle("border: none");
south.appendChild(confirmPanel);
//
confirmPanel.addActionListener(this);
confirmPanel.getOKButton().setEnabled(false);
confirmPanel.getOKButton().setEnabled(false);
LayoutUtils.sendDeferLayoutEvent(layout, 100);
} // jbInit
@ -194,7 +196,7 @@ public class WTask extends Window implements EventListener
{
if (taskThread != null && taskThread.isAlive())
taskThread.interrupt();
SessionManager.getAppDesktop().closeActiveWindow();
} // actionPerformed