ziver/webadmin
1
0
Fork 0
Code Pull requests Releases Activity

Some work on services

Browse source
This commit is contained in:
Ziver Koc 2016-04-07 14:30:07 +02:00
parent fc093b3ab8
commit 8532b681ca
14 changed files with 152 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/wa/server/page/LogPage.java
View file

@ -22,11 +22,14 @@
package wa.server.page;
import wa.server.WAContext;
import wa.server.plugin.WALog;
import zutil.io.file.FileUtil;
import zutil.net.http.HttpHeader;
import zutil.net.http.HttpPage;
import zutil.net.http.HttpPrintStream;
import zutil.parser.DataNode;
import zutil.parser.Templator;
import zutil.parser.json.JSONWriter;
import zutil.struct.CircularBuffer;
@ -39,7 +42,9 @@ import java.util.logging.LogRecord;
/**
* Created by Ziver on 2015-09-22.
*/
public class LogPage extends Handler implements HttpPage {
public class LogPage extends Handler implements HttpPage, WAPage {
private static final String TMPL_FILE = "WebContent/page/Log.tmpl";
private CircularBuffer<LogRecord> logBuffer;
private WALog log;
@ -64,6 +69,18 @@ public class LogPage extends Handler implements HttpPage {
}
@Override
public Templator htmlResponse(WAContext context, HttpHeader client_info, Map<String, Object> session, Map<String, String> cookie, Map<String, String> request) {
try {
return new Templator(FileUtil.find(TMPL_FILE));
} catch (IOException e) {
e.printStackTrace();
}
return null;
}
@Override
public void respond(HttpPrintStream out,
HttpHeader client_info,
@ -71,6 +88,15 @@ public class LogPage extends Handler implements HttpPage {
Map<String, String> cookie,
Map<String, String> request) throws IOException {
JSONWriter writer = new JSONWriter(out);
writer.write(jsonResponse());
writer.close();
}
@Override
public DataNode jsonResponse(WAContext context, HttpHeader client_info, Map<String, Object> session, Map<String, String> cookie, Map<String, String> request) {
return jsonResponse();
}
public DataNode jsonResponse() {
DataNode logNode = new DataNode(DataNode.DataType.List);
Iterator<LogRecord> it = logBuffer.iterator();
for(int i=0; i<20 && it.hasNext(); ++i){
@ -84,8 +110,6 @@ public class LogPage extends Handler implements HttpPage {
DataNode root = new DataNode(DataNode.DataType.Map);
root.add(logNode);
JSONWriter writer = new JSONWriter(out);
writer.write(root);
writer.close();
return root;
}
}

2
src/wa/server/page/ServicePage.java
View file

@ -102,7 +102,7 @@ public class ServicePage implements WAPage {
statusPage.htmlResponse(context, client_info, session, cookie, request));
if(logPage != null)
tmpl.set("service_logs",
statusPage.htmlResponse(context, client_info, session, cookie, request));
logPage.htmlResponse(context, client_info, session, cookie, request));
return tmpl;
}
else{ // root page

85
src/wa/server/page/WALogPage.java
View file

@ -1,85 +0,0 @@
/*
* Copyright (c) 2015 ezivkoc
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package wa.server.page;
import zutil.net.http.HttpHeader;
import zutil.net.http.HttpHeaderParser;
import zutil.net.http.HttpPage;
import zutil.net.http.HttpPrintStream;
import zutil.parser.DataNode;
import zutil.parser.json.JSONWriter;
import zutil.struct.CircularBuffer;
import java.io.IOException;
import java.util.Iterator;
import java.util.Map;
import java.util.logging.Handler;
import java.util.logging.LogRecord;
/**
* Created by Ziver on 2015-09-22.
*/
public class WALogPage extends Handler implements HttpPage {
private CircularBuffer<LogRecord> logBuffer;
@Override
public void publish(LogRecord record) {
if(super.isLoggable(record)){
logBuffer.add(record);
}
}
@Override
public void flush() {}
@Override
public void close() throws SecurityException {
throw new UnsupportedOperationException ();
}
@Override
public void respond(HttpPrintStream out,
HttpHeader client_info,
Map<String, Object> session,
Map<String, String> cookie,
Map<String, String> request) throws IOException {
DataNode logNode = new DataNode(DataNode.DataType.List);
Iterator<LogRecord> it = logBuffer.iterator();
for(int i=0; i<20 && it.hasNext(); ++i){
LogRecord record = it.next();
DataNode node = new DataNode(DataNode.DataType.Map);
node.set("timestamp", record.getMillis());
node.set("source", record.getLoggerName());
node.set("msg", record.getMessage());
logNode.add(node);
}
DataNode root = new DataNode(DataNode.DataType.Map);
root.add(logNode);
JSONWriter writer = new JSONWriter(out);
writer.write(root);
writer.close();
}
}

47
src/wa/server/page/struct/WANavigation.java
View file

@ -66,6 +66,7 @@ public class WANavigation implements Iterable{
nav = new WANavigation(name);
nav.setParentNav(this);
subNav.add(nav);
sortSubNavs();
return nav;
}
/**
@ -82,6 +83,8 @@ public class WANavigation implements Iterable{
Collections.sort(subNav, new Comparator<WANavigation>() {
@Override
public int compare(WANavigation o1, WANavigation o2) {
if (o1.weight == o2.weight)
return o1.name.compareToIgnoreCase(o2.name);
return o1.weight - o2.weight;
}
});
@ -147,22 +150,7 @@ public class WANavigation implements Iterable{
return instance;
}
/**
* @param request A map of all url parameters sent from client
* @return a List of WANavigation objects depicting the navigation hierarchy for the
* requested page from the client. First entry will be the root navigation object.
*/
public static List<WANavigation> getBreadcrumb(Map<String, String> request) {
LinkedList list = new LinkedList();
if(request.containsKey(NAVIGATION_URL_KEY)){
WANavigation current = navMap.get(Integer.parseInt(request.get(NAVIGATION_URL_KEY)));
while(current != null){
list.addFirst(current);
current = current.parentNav;
}
}
return list;
}
public static WANavigation createRootNav(){
return new WANavigation(null);
@ -174,6 +162,33 @@ public class WANavigation implements Iterable{
return null;
}
/**
* @return the specific WANavigation object requested by client
*/
public static WANavigation getNavigation(Map<String, String> request) {
if(request.containsKey(NAVIGATION_URL_KEY))
return navMap.get(Integer.parseInt(request.get(NAVIGATION_URL_KEY)));
return null;
}
/**
* @param request A map of all url parameters sent from client
* @return a List of WANavigation objects depicting the navigation hierarchy for the
* requested page from the client. First entry will be the root navigation object.
*/
public static List<WANavigation> getBreadcrumb(Map<String, String> request) {
LinkedList list = new LinkedList();
WANavigation current = getNavigation(request);
if (current != null){
while(current != null){
list.addFirst(current);
current = current.parentNav;
}
}
return list;
}
public static class NavInstance{