1 files changed, 20 insertions, 16 deletions

diff --git a/src/ocelot.cpp b/src/ocelot.cpp
index b7a484d..ea0b5c8 100644
--- a/src/ocelot.cpp
+++ b/src/ocelot.cpp
@@ -4,14 +4,10 @@
 #include "worker.h"
 #include "events.h"
 #include "schedule.h"
-#include "logger.h"
 #include "site_comm.h"
 
-static mysql *db_ptr;
 static connection_mother *mother;
 static worker *work;
-static logger *log_ptr;
-static site_comm *sc_ptr;
 
 static void sig_handler(int sig)
 {
@@ -21,42 +17,50 @@ static void sig_handler(int sig)
 	}
 }
 
-int main() {
+int main(int argc, char **argv) {
+	// we don't use printf so make cout/cerr a little bit faster
+	std::ios_base::sync_with_stdio(false);
+
 	config conf;
 
 	signal(SIGINT, sig_handler);
 	signal(SIGTERM, sig_handler);
 
-	log_ptr = new logger("debug.log");
+	bool verbose = false;
+	for (int i = argc; i > 1; i--) {
+		if (!strcmp(argv[1], "-v")) {
+			verbose = true;
+		}
+	}
 
 	mysql db(conf.mysql_db, conf.mysql_host, conf.mysql_username, conf.mysql_password);
-	db_ptr = &db;
+	db.verbose_flush = verbose;
 
 	site_comm sc(conf);
-	sc_ptr = ≻
-	
+	sc.verbose_flush = verbose;
+
 	std::vector<std::string> whitelist;
 	db.load_whitelist(whitelist);
 	std::cout << "Loaded " << whitelist.size() << " clients into the whitelist" << std::endl;
-	if(whitelist.size() == 0) {
+	if (whitelist.size() == 0) {
 		std::cout << "Assuming no whitelist desired, disabling" << std::endl;
 	}
-	
+
 	std::unordered_map<std::string, user> users_list;
 	db.load_users(users_list);
 	std::cout << "Loaded " << users_list.size() << " users" << std::endl;
-	
+
 	std::unordered_map<std::string, torrent> torrents_list;
 	db.load_torrents(torrents_list);
 	std::cout << "Loaded " << torrents_list.size() << " torrents" << std::endl;
 
 	db.load_tokens(torrents_list);
-	
+
 	// Create worker object, which handles announces and scrapes and all that jazz
-	work = new worker(torrents_list, users_list, whitelist, &conf, &db, sc);
-	
+	work = new worker(torrents_list, users_list, whitelist, &conf, &db, &sc);
+
 	// Create connection mother, which binds to its socket and handles the event stuff
-	mother = new connection_mother(work, &conf, &db);
+	mother = new connection_mother(work, &conf, &db, &sc);
 
 	return 0;
 }