Skip to content

Commit f58e345

Browse files
etretr
committed
Removed the comet subsystem entirely.
1 parent 3e7cbb4 commit f58e345

11 files changed

Lines changed: 4 additions & 525 deletions

File tree

‎examples/comet.cpp‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎src/Makefile.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
AM_CPPFLAGS = -I../ -I$(srcdir)/httpserver/
2020
METASOURCES = AUTO
2121
lib_LTLIBRARIES = libhttpserver.la
22-
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
23-
noinst_HEADERS = httpserver/string_utilities.hpp httpserver/details/modded_request.hpp httpserver/details/http_response_ptr.hpp httpserver/details/comet_manager.hpp gettext.h
22+
libhttpserver_la_SOURCES = string_utilities.cpp webserver.cpp http_utils.cpp http_request.cpp http_response.cpp http_resource.cpp details/http_endpoint.cpp
23+
noinst_HEADERS = httpserver/string_utilities.hpp httpserver/details/modded_request.hpp httpserver/details/http_response_ptr.hpp gettext.h
2424
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
2525

2626
AM_CXXFLAGS += -fPIC -Wall

‎src/details/comet_manager.cpp‎

Lines changed: 0 additions & 106 deletions
This file was deleted.

‎src/http_response.cpp‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -196,47 +196,6 @@ void http_response::decorate_response_deferred(MHD_Response* response)
196196
static_cast<http_response*>(this)->decorate_response(response);
197197
}
198198

199-
void http_response::get_raw_response_lp_receive(
200-
MHD_Response** response,
201-
webserver* ws
202-
)
203-
{
204-
this->ws = ws;
205-
this->connection_id = this->underlying_connection;
206-
207-
*response = MHD_create_response_from_callback(MHD_SIZE_UNKNOWN, 80,
208-
&http_response::data_generator, (void*) this, NULL);
209-
210-
ws->register_to_topics(
211-
topics,
212-
connection_id
213-
);
214-
}
215-
216-
ssize_t http_response::data_generator(
217-
void* cls,
218-
uint64_t pos,
219-
char* buf,
220-
size_t max
221-
)
222-
{
223-
http_response* _this = static_cast<http_response*>(cls);
224-
225-
string message;
226-
size_t size = _this->ws->read_message(_this->connection_id, message);
227-
memcpy(buf, message.c_str(), size);
228-
return size;
229-
}
230-
231-
void http_response::get_raw_response_lp_send(
232-
MHD_Response** response,
233-
webserver* ws
234-
)
235-
{
236-
http_response::get_raw_response_str(response, ws);
237-
ws->send_message_to_topic(send_topic, content);
238-
}
239-
240199
std::ostream &operator<< (std::ostream &os, const http_response &r)
241200
{
242201
os << "Response [response_code:" << r.response_code << "]" << std::endl;
@@ -248,5 +207,4 @@ std::ostream &operator<< (std::ostream &os, const http_response &r)
248207
return os;
249208
}
250209

251-
252210
};

‎src/httpserver/details/comet_manager.hpp‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎src/httpserver/http_response.hpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,6 @@ class http_response
239239
void get_raw_response_file(MHD_Response** res, webserver* ws = 0x0);
240240
void get_raw_response_switch_r(MHD_Response** res, webserver* ws = 0x0);
241241

242-
void get_raw_response_lp_receive(MHD_Response** res,
243-
webserver* ws = 0x0);
244-
245-
void get_raw_response_lp_send(MHD_Response** res, webserver* ws = 0x0);
246242
void get_raw_response_deferred(MHD_Response** res, webserver* ws = 0x0);
247243
void decorate_response_str(MHD_Response* res);
248244
void decorate_response_deferred(MHD_Response* res);

‎src/httpserver/http_response_builder.hpp‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -189,26 +189,6 @@ class http_response_builder
189189
return *this;
190190
}
191191

192-
http_response_builder& long_polling_receive_response(
193-
const std::vector<std::string>& topics,
194-
int keepalive_secs = -1,
195-
std::string keepalive_msg = ""
196-
)
197-
{
198-
_topics = topics;
199-
_keepalive_secs = keepalive_secs;
200-
_keepalive_msg = keepalive_msg;
201-
_get_raw_response = &http_response::get_raw_response_lp_receive;
202-
return *this;
203-
}
204-
205-
http_response_builder& long_polling_send_response(const std::string& send_topic)
206-
{
207-
_send_topic = send_topic;
208-
_get_raw_response = &http_response::get_raw_response_lp_send;
209-
return *this;
210-
}
211-
212192
http_response_builder& deferred_response(cycle_callback_ptr cycle_callback)
213193
{
214194
_cycle_callback = cycle_callback;

‎src/httpserver/webserver.hpp‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ struct httpserver_ska;
6161
namespace details {
6262
struct daemon_item;
6363
struct modded_request;
64-
class comet_manager;
6564
}
6665

6766
/**
@@ -110,16 +109,6 @@ class webserver
110109
void unban_ip(const std::string& ip);
111110
void disallow_ip(const std::string& ip);
112111

113-
void send_message_to_topic(const std::string& topic,
114-
const std::string& message
115-
);
116-
void register_to_topics(const std::vector<std::string>& topics,
117-
MHD_Connection* connection_id
118-
);
119-
size_t read_message(MHD_Connection* connection_id,
120-
std::string& message
121-
);
122-
123112
log_access_ptr get_access_logger() const
124113
{
125114
return this->log_access;
@@ -202,8 +191,6 @@ class webserver
202191
std::vector<details::daemon_item*> daemons;
203192
std::vector<pthread_t> threads;
204193

205-
details::comet_manager* internal_comet_manager;
206-
207194
static void* select(void* self);
208195
static void* cleaner(void* self);
209196

0 commit comments

Comments
 (0)