-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
88387e9
commit eca2ff0
Showing
11 changed files
with
49 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
id = syslogd | ||
name = syslogd | ||
group = biz.nellemann.syslogd | ||
version = 1.4.1 | ||
version = 1.4.2 | ||
description = "Syslog Director" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,38 +1,53 @@ | ||
package biz.nellemann.syslogd.net; | ||
|
||
import org.slf4j.Logger; | ||
import org.slf4j.LoggerFactory; | ||
import java.util.Collections; | ||
import java.util.stream.Collectors; | ||
|
||
import org.apache.commons.collections4.queue.CircularFifoQueue; | ||
|
||
import biz.nellemann.syslogd.SyslogPrinter; | ||
import biz.nellemann.syslogd.msg.SyslogMessage; | ||
import ro.pippo.core.Application; | ||
import ro.pippo.core.PippoSettings; | ||
|
||
public class WebServer extends Application { | ||
|
||
private final static Logger log = LoggerFactory.getLogger(WebServer.class); | ||
private final LogSocketHandler logSocketHandler = new LogSocketHandler(); | ||
private CircularFifoQueue<SyslogMessage> queue; | ||
|
||
public LogSocketHandler getLogSocketHandler() { | ||
return logSocketHandler; | ||
public WebServer(PippoSettings settings) { | ||
super((settings)); | ||
} | ||
|
||
public WebServer(PippoSettings settings) { | ||
public WebServer(PippoSettings settings, CircularFifoQueue<SyslogMessage> q) { | ||
super((settings)); | ||
queue = q; | ||
} | ||
|
||
|
||
@Override | ||
protected void onInit() { | ||
|
||
GET("/", routeContext -> routeContext.render("index")); | ||
|
||
GET("/ping", routeContext -> routeContext.send("pong")); | ||
|
||
/* | ||
GET("/log", routeContext -> routeContext.text().negotiateContentType().send( | ||
queue.stream().sorted(Collections.reverseOrder()).map(SyslogPrinter::toHtml).collect(Collectors.joining()) | ||
));*/ | ||
)); | ||
|
||
addWebSocket("/ws/log", logSocketHandler); | ||
|
||
} | ||
|
||
|
||
public LogSocketHandler getLogSocketHandler() { | ||
return logSocketHandler; | ||
} | ||
|
||
|
||
public void setQueue(CircularFifoQueue<SyslogMessage> q) { | ||
this.queue = q; | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters