make static things static

This commit is contained in:
blastmaster 2014-01-23 02:22:06 +01:00
parent 55fb0d0b0f
commit 7f5e571dfb
2 changed files with 86 additions and 72 deletions

View File

@ -6,14 +6,40 @@
class Routerin
{
public:
Routerin();
//Routerin(StaticFileHandler &sfh);
int event_route(struct mg_event *event);
~Routerin();
// const ???
static Routerin * get_instance()
{
static Routerin * me;
if ( ! me->hasInstance )
return me = new Routerin();
return me;
}
static int event_route(struct mg_event *event)
{
// Foohash fh;
Routerin *rouri = Routerin::get_instance();
switch (event->type) {
case MG_REQUEST_BEGIN:
return rouri->event_request_route(event);
case MG_THREAD_BEGIN:
return rouri->event_newthread_route(event);
case MG_REQUEST_END:
return rouri->event_requend_route(event);
case MG_HTTP_ERROR:
case MG_EVENT_LOG:
case MG_THREAD_END:
default:
return rouri->event_fallback_route(event);
}
}
private:
explicit Routerin();
StaticFileHandler sfh;
bool hasInstance = false;
int event_request_route ( struct mg_event *event);
int event_newthread_route ( struct mg_event *event);

View File

@ -16,24 +16,13 @@ Routerin::Routerin():
sfh( UltraSimpleStaticFileHandler())
{
cout << "Konstr Routering" << std::endl;
Routerin::hasInstance = true;
}
int Routerin::event_route(struct mg_event *event)
Routerin::~Routerin()
{
// Foohash fh;
switch(event->type){
case MG_REQUEST_BEGIN:
return event_request_route(event);
case MG_THREAD_BEGIN :
return event_newthread_route(event);
case MG_REQUEST_END:
return event_requend_route(event);
case MG_HTTP_ERROR:
case MG_EVENT_LOG :
case MG_THREAD_END:
default:
return event_fallback_route(event);
}
Routerin::hasInstance = false;
}
int Routerin::event_request_route(struct mg_event *event){
@ -109,7 +98,6 @@ int Routerin::rq_file(char const * const reststr , struct mg_event *event)
return 1;
}
int Routerin::rq_date(char const * const reststr , struct mg_event *event)
{
std::cerr << "requested filelist ordered by date!" << endl ;