some real code to dig into the rsyslog processing...

unfortunately, imdiag currently does not offer many counters (to
phrase it politely). Will need to implement a counter interface as
one of the very next steps...

7 files changed, 254 insertions, 3 deletions

diff --git a/java/com/rsyslog/gui/diaggui/DiagGUI.java b/java/com/rsyslog/gui/diaggui/DiagGUI.java
new file mode 100644
index 00000000..1a03299c
--- /dev/null
+++ b/java/com/rsyslog/gui/diaggui/DiagGUI.java
@@ -0,0 +1,77 @@
+/* A yet very simple diagnostic GUI for rsyslog.
+ * 
+ * Please note that this program requires imdiag to be loaded inside rsyslogd.
+ *
+ * Copyright 2009 Rainer Gerhards and Adiscon GmbH.
+ *
+ * This file is part of rsyslog.
+ *
+ * Rsyslog 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Rsyslog 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 Rsyslog.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * A copy of the GPL can be found in the file "COPYING" in this distribution.
+ */
+package com.rsyslog.gui.diaggui;
+import java.awt.*;
+import java.awt.event.*;
+
+public class DiagGUI extends Frame {
+	public Counters counterWin;
+	public static void main(String args[]) {
+		new DiagGUI();
+	}
+	
+	/** show counter window. creates it if not already present */
+	public void showCounters() {
+		if(counterWin == null) {
+			counterWin = new Counters();
+		} else {
+			counterWin.setVisible(true);
+			counterWin.toFront();
+		}
+	}
+
+		/** initialize the GUI. */
+	public DiagGUI(){
+		MenuItem item;
+		MenuBar menuBar = new MenuBar();
+		Menu fileMenu = new Menu("File");
+		item = new MenuItem("Exit");
+		item.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				System.exit(0);
+			}
+		});
+		fileMenu.add(item);
+		menuBar.add(fileMenu);
+
+		Menu viewMenu = new Menu("View");
+		item = new MenuItem("Counters");
+		item.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				showCounters();
+			}
+		});
+		viewMenu.add(item);
+		menuBar.add(viewMenu);
+
+		addWindowListener(new WindowAdapter() {
+			public void windowClosing(WindowEvent e){
+				System.exit(0);
+			}
+		});
+		setMenuBar(menuBar);
+		setSize(300,400);
+		setVisible(true);
+	}
+}
diff --git a/java/com/rsyslog/gui/simpServ/simpServ.java b/java/com/rsyslog/gui/simpServ/simpServ.java
index 5d248d90..2a83dad0 100644
--- a/java/com/rsyslog/gui/simpServ/simpServ.java
+++ b/java/com/rsyslog/gui/simpServ/simpServ.java
@@ -1,6 +1,31 @@
+/**
+ * Implementation of a tcp-based syslog server.
+ *
+ * @author Rainer Gerhards
+ * 
+ * Copyright 2009 Rainer Gerhards and Adiscon GmbH.
+ *
+ * This file is part of rsyslog.
+ *
+ * Rsyslog 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Rsyslog 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 Rsyslog.  If not, see http://www.gnu.org/licenses/.
+ *
+ * A copy of the GPL can be found in the file "COPYING" in this distribution.
+ */
+
 package com.rsyslog.gui.simpServ;
 import com.rsyslog.lib.*;
-import com.rsyslog.gui.*;
+//import com.rsyslog.gui.*;
 
 public class simpServ {
 
diff --git a/java/com/rsyslog/gui/simpServ/simpServConsumer.java b/java/com/rsyslog/gui/simpServ/simpServConsumer.java
index c7c576d7..588f2640 100644
--- a/java/com/rsyslog/gui/simpServ/simpServConsumer.java
+++ b/java/com/rsyslog/gui/simpServ/simpServConsumer.java
@@ -1,4 +1,26 @@
-/** A syslog message consumer for the simple syslog server. */
+/** A syslog message consumer for the simple syslog server.
+ * 
+ * @author Rainer Gerhards
+ * 
+ * Copyright 2009 Rainer Gerhards and Adiscon GmbH.
+ *
+ * This file is part of rsyslog.
+ *
+ * Rsyslog 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Rsyslog 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 Rsyslog.  If not, see http://www.gnu.org/licenses/.
+ *
+ * A copy of the GPL can be found in the file "COPYING" in this distribution.
+ */
 package com.rsyslog.gui.simpServ;
 import com.rsyslog.lib.*;
 
diff --git a/java/com/rsyslog/lib/DiagSess.java b/java/com/rsyslog/lib/DiagSess.java
new file mode 100644
index 00000000..799b9a4a
--- /dev/null
+++ b/java/com/rsyslog/lib/DiagSess.java
@@ -0,0 +1,78 @@
+/* The diagnostic session to an imdiag module (running inside rsyslogd).
+ *
+ * Copyright 2009 Rainer Gerhards and Adiscon GmbH.
+ *
+ * This file is part of rsyslog.
+ *
+ * Rsyslog 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Rsyslog 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 Rsyslog.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * A copy of the GPL can be found in the file "COPYING" in this distribution.
+ */
+package com.rsyslog.lib;
+import java.io.*;
+import java.net.*;
+
+public class DiagSess {
+
+	private String host = new String("127.0.0.1");
+	private int port = 13500;
+	int timeout = 0;
+	private PrintWriter out = null;
+    private BufferedReader in = null;
+	private Socket diagSocket = null;
+
+	/** set connection timeout */
+	public void setTimeout(int timeout_) {
+		timeout = timeout_;
+	}
+	
+	public DiagSess(String host_, int port_) {
+		host = host_;
+		port = port_;
+	}
+	
+	/** connect to remote server. Initializes everything for request-reply
+	 * processing.
+	 * 
+	 * @throws IOException
+	 */
+	public void connect() throws IOException {
+        diagSocket = new Socket(host, port);
+	    diagSocket.setSoTimeout(timeout);
+        out = new PrintWriter(diagSocket.getOutputStream(), true);
+        in = new BufferedReader(new InputStreamReader(
+                                    diagSocket.getInputStream()));
+	
+	}
+	
+	/** end session with remote server. */
+	public void disconnect() throws IOException {
+		out.close();
+		in.close();
+		diagSocket.close();
+	}
+
+	/** issue a request to imdiag and return its response.
+	 * 
+	 * @param req request string
+	 * @return response string (unparsed)
+	 * @throws IOException
+	 */
+	public String request(String req) throws IOException {
+	    out.println(req);
+	    String resp = in.readLine();
+	    return resp;
+	}
+	
+}
diff --git a/java/com/rsyslog/lib/SyslogMessage.java b/java/com/rsyslog/lib/SyslogMessage.java
index 11b51e33..b544a6db 100644
--- a/java/com/rsyslog/lib/SyslogMessage.java
+++ b/java/com/rsyslog/lib/SyslogMessage.java
@@ -27,7 +27,6 @@
  * A copy of the GPL can be found in the file "COPYING" in this distribution.
  */
 package com.rsyslog.lib;
-import com.rsyslog.gui.simpServ.*;
 
 public class SyslogMessage {
 
diff --git a/java/com/rsyslog/lib/SyslogMsgConsumer.java b/java/com/rsyslog/lib/SyslogMsgConsumer.java
index ceb16ffb..42c9931a 100644
--- a/java/com/rsyslog/lib/SyslogMsgConsumer.java
+++ b/java/com/rsyslog/lib/SyslogMsgConsumer.java
@@ -1,3 +1,27 @@
+/**
+ * Interface for SyslogConsumers.
+ * 
+ * @author Rainer Gerhards
+ * 
+ * Copyright 2009 Rainer Gerhards and Adiscon GmbH.
+ *
+ * This file is part of rsyslog.
+ *
+ * Rsyslog 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Rsyslog 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 Rsyslog.  If not, see http://www.gnu.org/licenses/.
+ *
+ * A copy of the GPL can be found in the file "COPYING" in this distribution.
+ */
 package com.rsyslog.lib;
 
 public interface SyslogMsgConsumer {
diff --git a/java/com/rsyslog/lib/SyslogServerTCP.java b/java/com/rsyslog/lib/SyslogServerTCP.java
index 09e0449b..d5376a32 100644
--- a/java/com/rsyslog/lib/SyslogServerTCP.java
+++ b/java/com/rsyslog/lib/SyslogServerTCP.java
@@ -1,3 +1,29 @@
+/**
+ * Implementation of a tcp-based syslog server.
+ *
+ * This is a limited-capability implementation of a syslog tcp server.
+ * 
+ * @author Rainer Gerhards
+ * 
+ * Copyright 2009 Rainer Gerhards and Adiscon GmbH.
+ *
+ * This file is part of rsyslog.
+ *
+ * Rsyslog 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Rsyslog 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 Rsyslog.  If not, see http://www.gnu.org/licenses/.
+ *
+ * A copy of the GPL can be found in the file "COPYING" in this distribution.
+ */
 package com.rsyslog.lib;
 
 import com.rsyslog.lib.SyslogMsgConsumer;