antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 5 Projects Releases 5 Activity Actions

simplified log file management, close log files when application is

Browse source 
shut down.
This commit is contained in:
hns 2001-08-31 15:42:33 +00:00
parent bbc2a61160
commit 858f5abdbe
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/helma/framework/core/Application.java
View file

@ -229,19 +229,33 @@ public class Application extends UnicastRemoteObject implements IRemoteApp, IRep
xmlrpc.removeHandler (this.name); xmlrpc.removeHandler (this.name);
// stop evaluators
if (allThreads != null) { if (allThreads != null) {
for (Enumeration e=allThreads.elements (); e.hasMoreElements (); ) { for (Enumeration e=allThreads.elements (); e.hasMoreElements (); ) {
RequestEvaluator ev = (RequestEvaluator) e.nextElement (); RequestEvaluator ev = (RequestEvaluator) e.nextElement ();
ev.stopThread (); ev.stopThread ();
} }
} }
// remove evaluators
allThreads.removeAllElements (); allThreads.removeAllElements ();
freeThreads = null; freeThreads = null;
// shut down node manager and embedded db
try { try {
nmgr.shutdown (); nmgr.shutdown ();
} catch (DbException dbx) { } catch (DbException dbx) {
System.err.println ("Error shutting down embedded db: "+dbx); System.err.println ("Error shutting down embedded db: "+dbx);
} }
// stop logs if they exist
if (eventLog != null) {
eventLog.close ();
}
if (accessLog != null) {
accessLog.close ();
}
} }
/** /**
@ -524,7 +538,7 @@ public class Application extends UnicastRemoteObject implements IRemoteApp, IRep
INode unode = users.getNode (uname, false); INode unode = users.getNode (uname, false);
String pw = unode.getString ("password", false); String pw = unode.getString ("password", false);
if (pw != null && pw.equals (password)) { if (pw != null && pw.equals (password)) {
// give the user her piece of persistence // give the user his/her persistant node
u.setNode (unode); u.setNode (unode);
activeUsers.put (unode.getName (), u.user); activeUsers.put (unode.getName (), u.user);
return true; return true;
@ -643,7 +657,7 @@ public class Application extends UnicastRemoteObject implements IRemoteApp, IRep
*/ */
public void logEvent (String msg) { public void logEvent (String msg) {
if (eventLog == null) if (eventLog == null)
eventLog = getLogger (name+"_event"); eventLog = getLogger ("event");
eventLog.log (msg); eventLog.log (msg);
} }
@ -652,7 +666,7 @@ public class Application extends UnicastRemoteObject implements IRemoteApp, IRep
*/ */
public void logAccess (String msg) { public void logAccess (String msg) {
if (accessLog == null) if (accessLog == null)
accessLog = getLogger (name+"_access"); accessLog = getLogger ("access");
accessLog.log (msg); accessLog.log (msg);
} }
@ -668,11 +682,13 @@ public class Application extends UnicastRemoteObject implements IRemoteApp, IRep
if ("console".equalsIgnoreCase (logDir)) if ("console".equalsIgnoreCase (logDir))
return new Logger (System.out); return new Logger (System.out);
try { try {
File helper = new File (logDir); File helper = new File (logDir);
// construct the fully qualified log name
String fullLogname = name +"_"+logname;
if (home != null && !helper.isAbsolute ()) if (home != null && !helper.isAbsolute ())
helper = new File (home, logDir); helper = new File (home, logDir);
logDir = helper.getAbsolutePath (); logDir = helper.getAbsolutePath ();
log = new Logger (logDir, logname); log = new Logger (logDir, fullLogname);
} catch (IOException iox) { } catch (IOException iox) {
System.err.println ("Could not create log "+logname+" for application "+name+": "+iox); System.err.println ("Could not create log "+logname+" for application "+name+": "+iox);
// fallback to System.out // fallback to System.out