WebSVN – HomeAutomation – Diff – /trunk/PcSoftware/Atom1.5/src/atomd.cpp/

 #include "broker/Manager.h"
 #include "control/Manager.h"
 #include "can/Network.h"
 #include "can/Monitor.h"
 #include "can/CanDaemon.h"
+#include "can/Forward.h"
 #include "vm/Manager.h"
 #include "storage/Manager.h"
 #include "net/GetFile.h"
 #include "net/Url.h"
 int main(int argc, char **argv)
+{
   /* Set core dump parameters */
   rlimit core_limit = { RLIM_INFINITY, RLIM_INFINITY };
   setrlimit( RLIMIT_CORE, &core_limit ); // enable core dumps
   /* Print startup information */
   log::Info(log_module_, "Atom daemon, version %s starting...", VERSION);
   log::Info(log_module_, "Released under %s.", LICENSE);
   log::Info(log_module_, "Written by Mattias Runge 2010-2012.");
   /* Register signal handlers */
   signal(SIGTERM, Handler);
   signal(SIGINT,  Handler);
   signal(SIGQUIT, Handler);
   signal(SIGABRT, Handler);
   signal(SIGPIPE, Handler);
   /* Check configuration */
   config::Manager::Create();
   if (!config::Manager::Instance()->Set(argc, argv))
+  {
     CleanUp();
     return EXIT_SUCCESS;
   }
   /* Set up logging */
   if (config::Manager::Instance()->Exist("LogFile"))
   {
     log::OpenFile(config::Manager::Instance()->GetAsString("LogFile"));
   }
   if (config::Manager::Instance()->Exist("LogLevelMask"))
+  {
     log::SetLevelByString(config::Manager::Instance()->GetAsString("LogLevelMask"));
+  }
   /* Enter daemon mode if requested */
   if (config::Manager::Instance()->Exist("daemon"))
+  {
     LOG.Info("Entering daemon mode...");
+    }
     log::Info(log_module_, "Deamon mode entered successfully!");
+  }
   /* Create singletons */
   storage::Manager::Create();
   timer::Manager::Create();
   broker::Manager::Create();
   net::Manager::Create();
   can::Protocol::Create();
   control::Manager::Create();
   vm::Manager::Create();
   std::string protocol_filename = config::Manager::Instance()->GetAsString("ProtocolFile");
   try
+  {
     net::Url url(protocol_filename);
     downloader = net::GetFile::Pointer(new net::GetFile());
     log::Info(log_module_, "Will try to download protocol file from \"%s\"...", protocol_filename.data());
     downloader->Start(url, HandleProtocolFileDownload);
+  }
   catch (std::exception& exception)
+  {
     log::Debug(log_module_, "Could not parse ProtocolFile as a URL, \"%s\".", protocol_filename.data());
     ContinueInitialization(protocol_filename);
+  }
   /* Lock main thread and wait for exit */
   boost::mutex::scoped_lock guard(guard_mutex);
   on_message_condition.wait(guard);
   /* Cleanup */
   log::Info(log_module_, "Cleaning up...");
   CleanUp();
   log::Info(log_module_, "Thank you for using Atom. Goodbye!");
   return EXIT_SUCCESS;
+}
 void ContinueInitialization(std::string protocol_filename)
 {
   /* Load protocol file */
   if (!can::Protocol::Instance()->Load(protocol_filename))
+  {
     log::Error(log_module_, "Failed to load %s!", protocol_filename.data());
     on_message_condition.notify_all();
+  }
   /* Set up storage path */
   storage::Manager::Instance()->SetRootPath(config::Manager::Instance()->GetAsString("StoragePath"));
   /* Start monitor server */
   if (config::Manager::Instance()->Exist("MonitorPort"))
+  {
     subscribers.push_back(can::Monitor::Pointer(new can::Monitor(config::Manager::Instance()->GetAsInt("MonitorPort"))));
+  }
   /* Start CanDaemon server */
   if (config::Manager::Instance()->Exist("DaemonPort"))
   {
     subscribers.push_back(can::CanDaemon::Pointer(new can::CanDaemon(config::Manager::Instance()->GetAsInt("DaemonPort"))));
+  }
+    /* Start CAN forward server */
+  if (config::Manager::Instance()->Exist("CanForwardPort"))
+  {
+    subscribers.push_back(can::Forward::Pointer(new can::Forward(config::Manager::Instance()->GetAsInt("CanForwardPort"))));
+  }
   /* Subscribe Can control manager to data */
   subscribers.push_back(control::Manager::Instance());
   /* Start VM plugins */
   vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::System(vm::Manager::Instance()->GetIoService())));
   vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::Console(vm::Manager::Instance()->GetIoService(), config::Manager::Instance()->GetAsInt("CommandPort"))));
   vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::JsPipe(vm::Manager::Instance()->GetIoService(), config::Manager::Instance()->GetAsInt("JsPipePort"))));
   vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::Storage(vm::Manager::Instance()->GetIoService())));
   vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::Socket(vm::Manager::Instance()->GetIoService())));
 #ifdef USE_PLUGIN_XORG
   vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::Xorg(vm::Manager::Instance()->GetIoService())));
 #endif // USE_PLUGIN_XORG
 #ifdef USE_PLUGIN_MYSQL
   vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::MySql(vm::Manager::Instance()->GetIoService())));
 #endif // USE_PLUGIN_MYSQL
   /* Start VM */
   vm::Manager::Instance()->Start(config::Manager::Instance()->GetAsString("ScriptPath"), config::Manager::Instance()->GetAsString("UserScriptPath"));
   /* Connect to Can network */
   if (config::Manager::Instance()->Exist("CanNet"))
+  {
     common::StringList cannetworks = config::Manager::Instance()->GetAsStringVector("CanNet");
+}
 void CleanUp()
+{
   downloader.reset();
   if (net::Manager::Instance().use_count() > 0)
+  {
     net::Manager::Instance()->Stop();
+  }
   can::Protocol::Delete();
   broker::Manager::Delete();
   vm::Manager::Delete();
   net::Manager::Delete();
   storage::Manager::Delete();
   log::CloseFile();
+}
 void Handler(int status)
+{

Subversion Repositories HomeAutomation

(root)/trunk/PcSoftware/Atom1.5/src/atomd.cpp/ – Rev 2107 → 2216