aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--src/dabInputZmq.cpp8
-rw-r--r--src/dabInputZmq.h5
-rw-r--r--src/dabOutput/dabOutputZMQ.cpp4
4 files changed, 22 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1b64400..6478216 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
This file contains information about the changes done to
the CRC-DabMux in this repository
+2014-01-32: Matthias P. Braendli <matthias@mpb.li>
+ (tag r11):
+ * crc-dabmux:
+ Replace TCPLog by Logger that supports syslog
+ Add TCP statistics server
+ Make ZMQ input publish buffer statistics
+ Add Munin helper script to graph ZMQ input stats
+ Fix ZMQ include when inputzmq disabled
+
2014-01-05: Matthias P. Braendli <matthias@mpb.li>
(tag r10):
* crc-dabmux:
diff --git a/src/dabInputZmq.cpp b/src/dabInputZmq.cpp
index 10c0f98..c84e81c 100644
--- a/src/dabInputZmq.cpp
+++ b/src/dabInputZmq.cpp
@@ -36,6 +36,12 @@
#include "dabInputZmq.h"
#include "StatsServer.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_INPUT_ZEROMQ
+
#include <stdio.h>
#include <zmq.hpp>
#include <list>
@@ -49,7 +55,7 @@
# define bzero(s, n) memset(s, 0, n)
#endif
-#ifdef HAVE_INPUT_ZEROMQ
+extern StatsServer* global_stats;
int DabInputZmq::open(const std::string inputUri)
{
diff --git a/src/dabInputZmq.h b/src/dabInputZmq.h
index 72bd348..bb37a94 100644
--- a/src/dabInputZmq.h
+++ b/src/dabInputZmq.h
@@ -37,11 +37,12 @@
#ifndef DAB_INPUT_ZMQ_H
#define DAB_INPUT_ZMQ_H
-#ifdef HAVE_INPUT_ZEROMQ
-
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+
+#ifdef HAVE_INPUT_ZEROMQ
+
#include <zmq.hpp>
#include <list>
#include <string>
diff --git a/src/dabOutput/dabOutputZMQ.cpp b/src/dabOutput/dabOutputZMQ.cpp
index 271cfa1..24fa6dc 100644
--- a/src/dabOutput/dabOutputZMQ.cpp
+++ b/src/dabOutput/dabOutputZMQ.cpp
@@ -32,7 +32,9 @@
You should have received a copy of the GNU General Public License
along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#if defined(HAVE_OUTPUT_ZEROMQ)