Removed the comet subsystem entirely.

Author: etr

examples/comet.cpp

@@ -19,8 +19,8 @@
 AM_CPPFLAGS = -I../ -I$(srcdir)/httpserver/
 METASOURCES = AUTO
 lib_LTLIBRARIES = libhttpserver.la
-libhttpserver_la_SOURCES = string_utilities.cpp webserver.cpp http_utils.cpp http_request.cpp http_response.cpp http_resource.cpp details/comet_manager.cpp details/http_endpoint.cpp
-noinst_HEADERS = httpserver/string_utilities.hpp httpserver/details/modded_request.hpp httpserver/details/http_response_ptr.hpp httpserver/details/comet_manager.hpp gettext.h
+libhttpserver_la_SOURCES = string_utilities.cpp webserver.cpp http_utils.cpp http_request.cpp http_response.cpp http_resource.cpp details/http_endpoint.cpp
+noinst_HEADERS = httpserver/string_utilities.hpp httpserver/details/modded_request.hpp httpserver/details/http_response_ptr.hpp gettext.h
 nobase_include_HEADERS = httpserver.hpp httpserver/create_webserver.hpp httpserver/webserver.hpp httpserver/http_utils.hpp httpserver/details/http_endpoint.hpp httpserver/http_request.hpp httpserver/http_response.hpp httpserver/http_resource.hpp httpserver/binders.hpp httpserver/http_response_builder.hpp
 
 AM_CXXFLAGS += -fPIC -Wall

src/Makefile.am

@@ -196,47 +196,6 @@ void http_response::decorate_response_deferred(MHD_Response* response)
         static_cast<http_response*>(this)->decorate_response(response);
 }
 
-void http_response::get_raw_response_lp_receive(
-        MHD_Response** response,
-        webserver* ws
-)
-{
-    this->ws = ws;
-    this->connection_id = this->underlying_connection;
-
-    *response = MHD_create_response_from_callback(MHD_SIZE_UNKNOWN, 80,
-        &http_response::data_generator, (void*) this, NULL);
-
-    ws->register_to_topics(
-            topics,
-            connection_id
-    );
-}
-
-ssize_t http_response::data_generator(
-        void* cls,
-        uint64_t pos,
-        char* buf,
-        size_t max
-)
-{
-    http_response* _this = static_cast<http_response*>(cls);
-
-    string message;
-    size_t size = _this->ws->read_message(_this->connection_id, message);
-    memcpy(buf, message.c_str(), size);
-    return size;
-}
-
-void http_response::get_raw_response_lp_send(
-        MHD_Response** response,
-        webserver* ws
-)
-{
-    http_response::get_raw_response_str(response, ws);
-    ws->send_message_to_topic(send_topic, content);
-}
-
 std::ostream &operator<< (std::ostream &os, const http_response &r)
 {
     os << "Response [response_code:" << r.response_code << "]" << std::endl;
@@ -248,5 +207,4 @@ std::ostream &operator<< (std::ostream &os, const http_response &r)
     return os;
 }
 
-
 };

src/details/comet_manager.cpp

@@ -239,10 +239,6 @@ class http_response
         void get_raw_response_file(MHD_Response** res, webserver* ws = 0x0);
         void get_raw_response_switch_r(MHD_Response** res, webserver* ws = 0x0);
 
-        void get_raw_response_lp_receive(MHD_Response** res,
-                webserver* ws = 0x0);
-
-        void get_raw_response_lp_send(MHD_Response** res, webserver* ws = 0x0);
         void get_raw_response_deferred(MHD_Response** res, webserver* ws = 0x0);
         void decorate_response_str(MHD_Response* res);
         void decorate_response_deferred(MHD_Response* res);

src/http_response.cpp

@@ -189,26 +189,6 @@ class http_response_builder
             return *this;
         }
 
-        http_response_builder& long_polling_receive_response(
-            const std::vector<std::string>& topics,
-            int keepalive_secs = -1,
-            std::string keepalive_msg = ""
-        )
-        {
-            _topics = topics;
-            _keepalive_secs = keepalive_secs;
-            _keepalive_msg = keepalive_msg;
-            _get_raw_response = &http_response::get_raw_response_lp_receive;
-            return *this;
-        }
-
-        http_response_builder& long_polling_send_response(const std::string& send_topic)
-        {
-            _send_topic = send_topic;
-            _get_raw_response = &http_response::get_raw_response_lp_send;
-            return *this;
-        }
-
         http_response_builder& deferred_response(cycle_callback_ptr cycle_callback)
         {
             _cycle_callback = cycle_callback;

src/httpserver/details/comet_manager.hpp

@@ -61,7 +61,6 @@ struct httpserver_ska;
 namespace details {
     struct daemon_item;
     struct modded_request;
-    class comet_manager;
 }
 
 /**
@@ -110,16 +109,6 @@ class webserver
         void unban_ip(const std::string& ip);
         void disallow_ip(const std::string& ip);
 
-        void send_message_to_topic(const std::string& topic,
-                const std::string& message
-        );
-        void register_to_topics(const std::vector<std::string>& topics,
-                MHD_Connection* connection_id
-        );
-        size_t read_message(MHD_Connection* connection_id,
-            std::string& message
-        );
-
         log_access_ptr get_access_logger() const
         {
             return this->log_access;
@@ -202,8 +191,6 @@ class webserver
         std::vector<details::daemon_item*> daemons;
         std::vector<pthread_t> threads;
 
-        details::comet_manager* internal_comet_manager;
-
         static void* select(void* self);
         static void* cleaner(void* self);