Removed logging_delegate an substituted with two explicit callbacks

(access_log and error_log)

Author: Sebastiano Merlino

src/httpserver/webserver.hpp

@@ -70,32 +70,6 @@ namespace http {
 struct ip_representation;
 };
 
-/**
- * Delegate class used to wrap callbacks dedicated to logging.
-**/
-class logging_delegate
-{
-    public:
-        /**
-         * Delegate constructor.
-        **/
-        logging_delegate();
-        /**
-         * Destructor of the class
-        **/
-        virtual ~logging_delegate();
-        /**
-         * Method used to log access to the webserver.
-         * @param s string to log
-        **/
-        virtual void log_access(const std::string& s) const;
-        /**
-         * Method used to log errors on the webserver.
-         * @param s string to log
-        **/
-        virtual void log_error(const std::string& s) const;
-};
-
 template <typename CHILD>
 class event_supplier
 {
@@ -135,7 +109,6 @@ class create_webserver;
 
 typedef bool(*validator_ptr)(const std::string&);
 typedef void(*unescaper_ptr)(char*);
-
 typedef void(*supply_events_ptr)(
                 fd_set*, 
                 fd_set*, 
@@ -144,8 +117,9 @@ typedef void(*supply_events_ptr)(
         );
 
 typedef long(*get_timeout_ptr)();
-
 typedef void(*dispatch_events_ptr)();
+typedef void(*log_access_ptr)(const std::string&);
+typedef void(*log_error_ptr)(const std::string&);
 
 struct event_tuple;
 
@@ -184,7 +158,8 @@ class webserver
             int memory_limit = 0,
             int connection_timeout = DEFAULT_WS_TIMEOUT,
             int per_IP_connection_limit = 0,
-            logging_delegate* log_delegate = 0x0,
+            log_access_ptr log_access = 0x0,
+            log_error_ptr log_error = 0x0,
             validator_ptr validator = 0x0,
             unescaper_ptr unescaper = 0x0,
             const struct sockaddr* bind_address = 0x0,
@@ -266,9 +241,25 @@ class webserver
         bool is_valid(const std::string& key);
         void clean_cache();
 
-        const logging_delegate* get_logging_delegate() const;
+        const log_access_ptr get_access_logger() const
+        {
+            return this->log_access;
+        }
+
+        const log_error_ptr get_error_logger() const
+        {
+            return this->log_error;
+        }
 
-        void set_logging_delegate(logging_delegate* log_delegate, bool delete_old = false);
+        void set_access_logger(log_access_ptr log_access)
+        {
+            this->log_access = log_access;
+        }
+
+        void set_error_logger(log_error_ptr log_error)
+        {
+            this->log_error = log_error;
+        }
 
         const validator_ptr get_request_validator() const
         {
@@ -308,7 +299,8 @@ class webserver
         int memory_limit;
         int connection_timeout;
         int per_IP_connection_limit;
-        logging_delegate* log_delegate;
+        log_access_ptr log_access;
+        log_error_ptr log_error;
         validator_ptr validator;
         unescaper_ptr unescaper;
         const struct sockaddr* bind_address;
@@ -471,7 +463,8 @@ class create_webserver
             _memory_limit(0),
             _connection_timeout(DEFAULT_WS_TIMEOUT),
             _per_IP_connection_limit(0),
-            _log_delegate(0x0),
+            _log_access(0x0),
+            _log_error(0x0),
             _validator(0x0),
             _unescaper(0x0),
             _bind_address(0x0),
@@ -510,7 +503,8 @@ class create_webserver
             _memory_limit(0),
             _connection_timeout(DEFAULT_WS_TIMEOUT),
             _per_IP_connection_limit(0),
-            _log_delegate(0x0),
+            _log_access(0x0),
+            _log_error(0x0),
             _validator(0x0),
             _unescaper(0x0),
             _bind_address(0x0),
@@ -548,7 +542,8 @@ class create_webserver
         create_webserver& memory_limit(int memory_limit) { _memory_limit = memory_limit; return *this; }
         create_webserver& connection_timeout(int connection_timeout) { _connection_timeout = connection_timeout; return *this; }
         create_webserver& per_IP_connection_limit(int per_IP_connection_limit) { _per_IP_connection_limit = per_IP_connection_limit; return *this; }
-        create_webserver& log_delegate(logging_delegate* log_delegate) { _log_delegate = log_delegate; return *this; }
+        create_webserver& log_access(log_access_ptr log_access) { _log_access = log_access; return *this; }
+        create_webserver& log_error(log_error_ptr log_error) { _log_error = log_error; return *this; }
         create_webserver& validator(validator_ptr validator) { _validator = validator; return *this; }
         create_webserver& unescaper(unescaper_ptr unescaper) { _unescaper = unescaper; return *this; }
         create_webserver& bind_address(const struct sockaddr* bind_address) { _bind_address = bind_address; return *this; }
@@ -596,7 +591,8 @@ class create_webserver
         int _memory_limit;
         int _connection_timeout;
         int _per_IP_connection_limit;
-        logging_delegate* _log_delegate;
+        log_access_ptr _log_access;
+        log_error_ptr _log_error;
         validator_ptr _validator;
         unescaper_ptr _unescaper;
         const struct sockaddr* _bind_address;

src/webserver.cpp

@@ -333,15 +333,6 @@ static void ignore_sigpipe ()
         fprintf (stderr, gettext("Failed to install SIGPIPE handler: %s\n"), strerror (errno));
 }
 
-//LOGGING DELEGATE
-logging_delegate::logging_delegate() {}
-
-logging_delegate::~logging_delegate() {}
-
-void logging_delegate::log_access(const string& s) const {}
-
-void logging_delegate::log_error(const string& s) const {}
-
 //WEBSERVER CREATOR
 create_webserver& create_webserver::https_mem_key(const std::string& https_mem_key)
 {
@@ -377,7 +368,8 @@ webserver::webserver
     int memory_limit,
     int connection_timeout,
     int per_IP_connection_limit,
-    logging_delegate* log_delegate,
+    log_access_ptr log_access,
+    log_error_ptr log_error,
     validator_ptr validator,
     unescaper_ptr unescaper,
     const struct sockaddr* bind_address,
@@ -414,7 +406,8 @@ webserver::webserver
     memory_limit(memory_limit),
     connection_timeout(connection_timeout),
     per_IP_connection_limit(per_IP_connection_limit),
-    log_delegate(log_delegate),
+    log_access(log_access),
+    log_error(log_error),
     validator(validator),
     unescaper(unescaper),
     bind_address(bind_address),
@@ -455,7 +448,8 @@ webserver::webserver(const create_webserver& params):
     memory_limit(params._memory_limit),
     connection_timeout(params._connection_timeout),
     per_IP_connection_limit(params._per_IP_connection_limit),
-    log_delegate(params._log_delegate),
+    log_access(params._log_access),
+    log_error(params._log_error),
     validator(params._validator),
     unescaper(params._unescaper),
     bind_address(params._bind_address),
@@ -497,7 +491,8 @@ webserver& webserver::operator=(const webserver& b)
     memory_limit = b.memory_limit;
     connection_timeout = b.connection_timeout;
     per_IP_connection_limit = b.per_IP_connection_limit;
-    log_delegate = b.log_delegate;
+    log_access = b.log_access;
+    log_error = b.log_error;
     validator = b.validator;
     unescaper = b.unescaper;
     bind_address = b.bind_address;
@@ -1109,18 +1104,14 @@ void* uri_log(void* cls, const char* uri)
 void error_log(void* cls, const char* fmt, va_list ap)
 {
     webserver* dws = static_cast<webserver*>(cls);
-    if(dws->log_delegate != 0x0)
-    {
-        dws->log_delegate->log_error(fmt);
-    }
+    if(dws->log_error != 0x0)
+        dws->log_error(fmt);
 }
 
 void access_log(webserver* dws, string uri)
 {
-    if(dws->log_delegate != 0x0)
-    {
-        dws->log_delegate->log_access(uri);
-    }
+    if(dws->log_access != 0x0)
+        dws->log_access(uri);
 }
 
 size_t unescaper_func(void * cls, struct MHD_Connection *c, char *s)
@@ -1159,18 +1150,6 @@ int webserver::post_iterator (void *cls, enum MHD_ValueKind kind,
     return MHD_YES;
 }
 
-const logging_delegate* webserver::get_logging_delegate() const
-{
-    return this->log_delegate;
-}
-
-void webserver::set_logging_delegate(logging_delegate* log_delegate, bool delete_old)
-{
-    if(delete_old && this->log_delegate != 0x0)
-        delete this->log_delegate;
-    this->log_delegate = log_delegate;
-}
-
 void webserver::upgrade_handler (void *cls, struct MHD_Connection* connection,
     void **con_cls, int upgrade_socket)
 {