From b07983f7ea4eefd435ee49d3f172db63ad22333f Mon Sep 17 00:00:00 2001
From: Marko Zivanovic <marko@ast.co.rs>
Date: Wed, 9 Sep 2015 11:11:29 +0200
Subject: [PATCH] Fix invalid handling of input filenames command line option;
 Print dot every second while sending messages to indicate activity

---
 src/CMakeLists.txt         |  2 +-
 src/SyslogBulkUploader.cpp |  4 ++++
 src/SyslogBulkUploader.h   | 15 +++++++++++++++
 src/main.cpp               | 22 ++++++++++++++++++----
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 20f0c31..9562ff1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -39,7 +39,7 @@ set(CPACK_GENERATOR "RPM;DEB;TGZ")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${VER_NAME}")
 set(CPACK_PACKAGE_VENDOR "Marko Zivanovic <marko@zivanovic.in.rs>")
 set(CPACK_PACKAGE_CONTACT "${CPACK_PACKAGE_VENDOR}")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../README.md")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/PackageDescription.txt")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Utility to send messages from file to remote syslog server")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE")
 set(CPACK_PACKAGE_VERSION "${SLBU_VER}")
diff --git a/src/SyslogBulkUploader.cpp b/src/SyslogBulkUploader.cpp
index 85663de..e48d81d 100644
--- a/src/SyslogBulkUploader.cpp
+++ b/src/SyslogBulkUploader.cpp
@@ -34,6 +34,10 @@ void SyslogBulkUploader::run() {
 
     while (auto msg = _reader.nextMessage()) {
         freqLimit.tick();
+        if (_preSendCallback)
+            _preSendCallback(msg);
         _writer.sendMessage(msg);
+        if (_postSendCallback)
+            _postSendCallback(msg);
     }
 }
diff --git a/src/SyslogBulkUploader.h b/src/SyslogBulkUploader.h
index 9912faf..683d3a8 100644
--- a/src/SyslogBulkUploader.h
+++ b/src/SyslogBulkUploader.h
@@ -26,23 +26,38 @@ SOFTWARE.
 #define	SYSLOGBULKUPLOADER_H
 
 #include <boost/noncopyable.hpp>
+#include <functional>
+#include <memory>
 
 class Reader;
 class Writer;
+class SyslogMessage;
 
 class SyslogBulkUploader : boost::noncopyable {
 public:
 
+    typedef std::function<void(std::shared_ptr<const SyslogMessage>)> Callback;
+
     SyslogBulkUploader(Reader& reader, Writer& writer, const size_t& mps = DEFAULT_MPS) : _reader(reader),
     _writer(writer), _mps(mps) {
     };
     void run();
 
+    void setPreSendCallback(Callback cb) {
+        _preSendCallback = cb;
+    }
+
+    void setPostSendCallback(Callback cb) {
+        _postSendCallback = cb;
+    }
+
 private:
     const static size_t DEFAULT_MPS = 1000;
     Reader& _reader;
     Writer& _writer;
     const size_t _mps;
+    Callback _preSendCallback;
+    Callback _postSendCallback;
 };
 
 #endif	/* SYSLOGBULKUPLOADER_H */
diff --git a/src/main.cpp b/src/main.cpp
index b63c268..52a310a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -33,12 +33,16 @@ SOFTWARE.
 
 namespace po = boost::program_options;
 using namespace std;
+using namespace boost::posix_time;
 
 po::options_description desc("Supported options");
 size_t mps;
 string dest;
 uint16_t port;
 vector<string> files;
+ptime start;
+ptime lastPrint;
+time_duration printInterval = seconds(1);
 
 string version() {
     stringstream ss;
@@ -50,6 +54,14 @@ void help() {
     desc.print(cout);
 }
 
+void preSendCallback(shared_ptr<const SyslogMessage>) {
+    ptime now = second_clock::local_time();
+    if (now - lastPrint > printInterval) {
+        cout << "." << flush;
+        lastPrint = now;
+    }
+}
+
 int main(int argc, char** argv) {
     desc.add_options()
             ("help,h", "display help message")
@@ -60,7 +72,7 @@ int main(int argc, char** argv) {
             ("file,f", po::value<vector < string >> (&files), "input file(s)")
             ;
     po::positional_options_description pos;
-    pos.add("files", -1);
+    pos.add("file", -1);
     po::variables_map vars;
 
     try {
@@ -87,7 +99,7 @@ int main(int argc, char** argv) {
         return -1;
     }
 
-    if (!vars.count("files")) {
+    if (!vars.count("file")) {
         cout << "ERROR: You must specify at least one input file" << endl;
         help();
         return -1;
@@ -95,14 +107,16 @@ int main(int argc, char** argv) {
 
     UDPWriter w(dest, port);
 
+    lastPrint = start = second_clock::local_time();
     for (auto& file : files) {
         try {
             FileReader r(file);
             SyslogBulkUploader uploader(r, w, mps);
+            uploader.setPostSendCallback(bind(preSendCallback, placeholders::_1));
             cout << "Sending logs from " << file << " to udp://" << dest << ":" << port << " at a max rate of " <<
-                    mps << " messages per second ... " << flush;
+                    mps << " messages per second " << flush;
             uploader.run();
-            cout << "done" << endl;
+            cout << " - DONE" << endl;
         } catch (string& ex) {
             cout << ex << endl;
         } catch (exception& ex) {