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


/*
 *
 *  Copyright (C) 2010  Mattias Runge
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License along
 *  with this program; if not, write to the Free Software Foundation, Inc.,
 *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 *
 */
 
#include <signal.h>
 
#include <boost/program_options.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition.hpp>
#include <boost/thread/locks.hpp>
 
#include "config.h"
 
#include "logging/Logger.h"
#include "net/Manager.h"
#include "timer/Manager.h"
#include "config/Manager.h"
#include "can/Protocol.h"
#include "broker/Manager.h"
#include "control/Manager.h"
#include "can/Network.h"
#include "can/Monitor.h"
#include "can/CanDaemon.h"
#include "vm/Manager.h"
#include "storage/Manager.h"
#include "mbb/Manager.h"
 
#include "vm/plugin/System.h"
#include "vm/plugin/Timer.h"
#include "vm/plugin/Module.h"
#include "vm/plugin/Node.h"
#include "vm/plugin/Console.h"
#include "vm/plugin/Storage.h"
#include "vm/plugin/Socket.h"
 
#ifdef USE_PLUGIN_XORG
#include "vm/plugin/Xorg.h"
#endif // USE_PLUGIN_XORG
 
using namespace atom;
 
logging::Logger LOG ("Main");
std::vector<broker::Subscriber::Pointer> subscribers;
boost::condition on_message_condition;
boost::mutex guard_mutex;
 
void Handler (int status);
void CleanUp();
 
int main (int argc, char **argv)
{
  LOG.Info ("\033[29;1mAtom Daemon, version " + std::string (VERSION) + " starting...\033[0m");
  LOG.Info ("\033[29;1mReleased under " + std::string (LICENSE) + ".\033[0m");
  LOG.Info ("Written by Mattias Runge 2010-2012.");
 
  signal (SIGTERM, Handler);
  signal (SIGINT, Handler);
  signal (SIGQUIT, Handler);
  signal (SIGABRT, Handler);
  signal (SIGPIPE, Handler);
 
  config::Manager::Create();
 
  if (!config::Manager::Instance()->Set (argc, argv))
  {
    CleanUp();
    return EXIT_SUCCESS;
  }
 
  if (config::Manager::Instance()->Exist ("LogFile"))
  {
    logging::Logger::OpenFile (config::Manager::Instance()->GetAsString ("LogFile"));
  }
 
  if (config::Manager::Instance()->Exist ("LogLevel"))
  {
    logging::Logger::SetLevel ( (logging::Logger::Level) config::Manager::Instance()->GetAsInt ("LogLevel"));
  }
 
  if (config::Manager::Instance()->Exist ("daemon"))
  {
    LOG.Info ("Entering daemon mode...");
 
    if (daemon (0, 0) == -1)
    {
      LOG.Error ("Could not enter daemon mode. Exiting...");
      CleanUp();
      return EXIT_FAILURE;
    }
 
    LOG.Info ("Deamon mode entered successfully!");
  }
 
  storage::Manager::Create();
 
  timer::Manager::Create();
  broker::Manager::Create();
  net::Manager::Create();
  can::Protocol::Create();
  control::Manager::Create();
  vm::Manager::Create();
 
  if (config::Manager::Instance()->Exist ("MbbPort"))
  {
    mbb::Manager::Create (config::Manager::Instance()->GetAsInt ("MbbPort"));
  }
 
  storage::Manager::Instance()->SetRootPath (config::Manager::Instance()->GetAsString ("StoragePath"));
 
  can::Protocol::Instance()->Load (config::Manager::Instance()->GetAsString ("ProtocolFile"));
 
  if (config::Manager::Instance()->Exist ("MonitorPort"))
  {
    subscribers.push_back (can::Monitor::Pointer (new can::Monitor (config::Manager::Instance()->GetAsInt ("MonitorPort"))));
  }
 
  if (config::Manager::Instance()->Exist ("DaemonPort"))
  {
    subscribers.push_back (can::CanDaemon::Pointer (new can::CanDaemon (config::Manager::Instance()->GetAsInt ("DaemonPort"))));
  }
 
  subscribers.push_back (control::Manager::Instance());
 
  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::Storage (vm::Manager::Instance()->GetIoService())));
  vm::Manager::Instance()->AddPlugin (vm::Plugin::Pointer (new vm::plugin::Timer (vm::Manager::Instance()->GetIoService())));
  vm::Manager::Instance()->AddPlugin (vm::Plugin::Pointer (new vm::plugin::Module (vm::Manager::Instance()->GetIoService())));
  vm::Manager::Instance()->AddPlugin (vm::Plugin::Pointer (new vm::plugin::Node (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
 
  vm::Manager::Instance()->Start (config::Manager::Instance()->GetAsString ("ScriptPath"), config::Manager::Instance()->GetAsString ("UserScriptPath"));
 
  if (config::Manager::Instance()->Exist ("CanNet"))
  {
    common::StringList cannetworks = config::Manager::Instance()->GetAsStringVector ("CanNet");
 
    for (uint n = 0; n < cannetworks.size(); n++)
    {
      subscribers.push_back (can::Network::Pointer (new can::Network (cannetworks[n])));
    }
  }
 
  boost::mutex::scoped_lock guard (guard_mutex);
 
  on_message_condition.wait (guard);
 
  LOG.Info ("Cleaning up...");
 
  CleanUp();
 
  LOG.Info ("Thank you for using Atom. Goodbye!");
 
  return EXIT_SUCCESS;
}
 
void CleanUp()
{
  net::Manager::Instance()->Stop();
 
  subscribers.clear();
  config::Manager::Delete();
  timer::Manager::Delete();
  control::Manager::Delete();
  mbb::Manager::Delete();
  can::Protocol::Delete();
  broker::Manager::Delete();
  vm::Manager::Delete();
  net::Manager::Delete();
  storage::Manager::Delete();
}
 
void Handler (int status)
{
  std::string signal_name = "Unknown";
 
  switch (status)
  {
    case SIGTERM:
    {
      signal_name = "Terminate";
      break;
    }
 
    case SIGINT:
    {
      signal_name = "Interupt";
      break;
    }
 
    case SIGQUIT:
    {
      signal_name = "Quit";
      break;
    }
 
    case SIGABRT:
    {
      signal_name = "Abort";
      break;
    }
 
    case SIGIO:
    {
      signal_name = "I/O";
      break;
    }
 
    case SIGPIPE:
    {
      signal_name = "Pipe";
      break;
    }
  }
 
  LOG.Debug ("Received signal " + signal_name + "(" + boost::lexical_cast<std::string> (status) + ").");
 
  if (status != SIGPIPE)
  {
    on_message_condition.notify_all();
  }
}
 
 

Rev 1914	Rev 1939
1	/*	1	/*
2	*	2	*
3	* Copyright (C) 2010 Mattias Runge	3	* Copyright (C) 2010 Mattias Runge
4	*	4	*
5	* This program is free software; you can redistribute it and/or modify	5	* This program is free software; you can redistribute it and/or modify
6	* it under the terms of the GNU General Public License as published by	6	* it under the terms of the GNU General Public License as published by
7	* the Free Software Foundation; either version 2 of the License, or	7	* the Free Software Foundation; either version 2 of the License, or
8	* (at your option) any later version.	8	* (at your option) any later version.
9	*	9	*
10	* This program is distributed in the hope that it will be useful,	10	* This program is distributed in the hope that it will be useful,
11	* but WITHOUT ANY WARRANTY; without even the implied warranty of	11	* but WITHOUT ANY WARRANTY; without even the implied warranty of
12	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	12	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13	* GNU General Public License for more details.	13	* GNU General Public License for more details.
14	*	14	*
15	* You should have received a copy of the GNU General Public License along	15	* You should have received a copy of the GNU General Public License along
16	* with this program; if not, write to the Free Software Foundation, Inc.,	16	* with this program; if not, write to the Free Software Foundation, Inc.,
17	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.	17	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18	*	18	*
19	*/	19	*/
20		20
21	#include <signal.h>	21	#include <signal.h>
22		22
23	#include <boost/program_options.hpp>	23	#include <boost/program_options.hpp>
24	#include <boost/thread/mutex.hpp>	24	#include <boost/thread/mutex.hpp>
25	#include <boost/thread/condition.hpp>	25	#include <boost/thread/condition.hpp>
26	#include <boost/thread/locks.hpp>	26	#include <boost/thread/locks.hpp>
27		27
28	#include "config.h"	28	#include "config.h"
29		29
30	#include "logging/Logger.h"	30	#include "logging/Logger.h"
31	#include "net/Manager.h"	31	#include "net/Manager.h"
32	#include "timer/Manager.h"	32	#include "timer/Manager.h"
33	#include "config/Manager.h"	33	#include "config/Manager.h"
34	#include "can/Protocol.h"	34	#include "can/Protocol.h"
35	#include "broker/Manager.h"	35	#include "broker/Manager.h"
36	#include "control/Manager.h"	36	#include "control/Manager.h"
37	#include "can/Network.h"	37	#include "can/Network.h"
38	#include "can/Monitor.h"	38	#include "can/Monitor.h"
39	#include "can/CanDaemon.h"	39	#include "can/CanDaemon.h"
40	#include "vm/Manager.h"	40	#include "vm/Manager.h"
41	#include "storage/Manager.h"	41	#include "storage/Manager.h"
-		42	#include "mbb/Manager.h"
42		43
43	#include "vm/plugin/System.h"	44	#include "vm/plugin/System.h"
44	#include "vm/plugin/Timer.h"	45	#include "vm/plugin/Timer.h"
45	#include "vm/plugin/Module.h"	46	#include "vm/plugin/Module.h"
46	#include "vm/plugin/Node.h"	47	#include "vm/plugin/Node.h"
47	#include "vm/plugin/Console.h"	48	#include "vm/plugin/Console.h"
48	#include "vm/plugin/Storage.h"	49	#include "vm/plugin/Storage.h"
49	#include "vm/plugin/Socket.h"	50	#include "vm/plugin/Socket.h"
50		51
51	#ifdef USE_PLUGIN_XORG	52	#ifdef USE_PLUGIN_XORG
52	#include "vm/plugin/Xorg.h"	53	#include "vm/plugin/Xorg.h"
53	#endif // USE_PLUGIN_XORG	54	#endif // USE_PLUGIN_XORG
54		55
55	using namespace atom;	56	using namespace atom;
56		57
57	logging::Logger LOG("Main");	58	logging::Logger LOG ("Main");
58	std::vector<broker::Subscriber::Pointer> subscribers;	59	std::vector<broker::Subscriber::Pointer> subscribers;
59	boost::condition on_message_condition;	60	boost::condition on_message_condition;
60	boost::mutex guard_mutex;	61	boost::mutex guard_mutex;
61		62
62	void Handler(int status);	63	void Handler (int status);
63	void CleanUp();	64	void CleanUp();
64		65
65	int main(int argc, char **argv)	66	int main (int argc, char **argv)
66	{	67	{
67	LOG.Info("\033[29;1mAtom Daemon, version " + std::string(VERSION) + " starting...\033[0m");	68	LOG.Info ("\033[29;1mAtom Daemon, version " + std::string (VERSION) + " starting...\033[0m");
68	LOG.Info("\033[29;1mReleased under " + std::string(LICENSE) + ".\033[0m");	69	LOG.Info ("\033[29;1mReleased under " + std::string (LICENSE) + ".\033[0m");
69	LOG.Info("Written by Mattias Runge 2010.");	70	LOG.Info ("Written by Mattias Runge 2010-2012.");
70		71
71	signal(SIGTERM, Handler);	72	signal (SIGTERM, Handler);
72	signal(SIGINT, Handler);	73	signal (SIGINT, Handler);
73	signal(SIGQUIT, Handler);	74	signal (SIGQUIT, Handler);
74	signal(SIGABRT, Handler);	75	signal (SIGABRT, Handler);
75	signal(SIGPIPE, Handler);	76	signal (SIGPIPE, Handler);
76		77
77	config::Manager::Create();	78	config::Manager::Create();
78		79
79	if (!config::Manager::Instance()->Set(argc, argv))	80	if (!config::Manager::Instance()->Set (argc, argv))
80	{	81	{
81	CleanUp();	82	CleanUp();
82	return EXIT_SUCCESS;	83	return EXIT_SUCCESS;
83	}	84	}
84		85
85	if (config::Manager::Instance()->Exist("LogFile"))	86	if (config::Manager::Instance()->Exist ("LogFile"))
86	{	87	{
87	logging::Logger::OpenFile(config::Manager::Instance()->GetAsString("LogFile"));	88	logging::Logger::OpenFile (config::Manager::Instance()->GetAsString ("LogFile"));
88	}	89	}
89		90
90	if (config::Manager::Instance()->Exist("LogLevel"))	91	if (config::Manager::Instance()->Exist ("LogLevel"))
91	{	92	{
92	logging::Logger::SetLevel((logging::Logger::Level)config::Manager::Instance()->GetAsInt("LogLevel"));	93	logging::Logger::SetLevel ( (logging::Logger::Level) config::Manager::Instance()->GetAsInt ("LogLevel"));
93	}	94	}
94		95
95	if (config::Manager::Instance()->Exist("daemon"))	96	if (config::Manager::Instance()->Exist ("daemon"))
96	{	97	{
97	LOG.Info("Entering daemon mode...");	98	LOG.Info ("Entering daemon mode...");
98		99
99	if (daemon(0, 0) == -1)	100	if (daemon (0, 0) == -1)
100	{	101	{
101	LOG.Error("Could not enter daemon mode. Exiting...");	102	LOG.Error ("Could not enter daemon mode. Exiting...");
102	CleanUp();	103	CleanUp();
103	return EXIT_FAILURE;	104	return EXIT_FAILURE;
104	}	105	}
105		106
106	LOG.Info("Deamon mode entered successfully!");	107	LOG.Info ("Deamon mode entered successfully!");
107	}	108	}
108		109
109	storage::Manager::Create();	110	storage::Manager::Create();
-		111
110	timer::Manager::Create();	112	timer::Manager::Create();
111	broker::Manager::Create();	113	broker::Manager::Create();
112	net::Manager::Create();	114	net::Manager::Create();
113	can::Protocol::Create();	115	can::Protocol::Create();
114	control::Manager::Create();	116	control::Manager::Create();
115	vm::Manager::Create();	117	vm::Manager::Create();
-		118
-		119	if (config::Manager::Instance()->Exist ("MbbPort"))
-		120	{
-		121	mbb::Manager::Create (config::Manager::Instance()->GetAsInt ("MbbPort"));
-		122	}
116		123
117	storage::Manager::Instance()->SetRootPath(config::Manager::Instance()->GetAsString("StoragePath"));	124	storage::Manager::Instance()->SetRootPath (config::Manager::Instance()->GetAsString ("StoragePath"));
118		125
119	can::Protocol::Instance()->Load(config::Manager::Instance()->GetAsString("ProtocolFile"));	126	can::Protocol::Instance()->Load (config::Manager::Instance()->GetAsString ("ProtocolFile"));
120		127
121	if (config::Manager::Instance()->Exist("MonitorPort"))	128	if (config::Manager::Instance()->Exist ("MonitorPort"))
122	{	129	{
123	subscribers.push_back(can::Monitor::Pointer(new can::Monitor(config::Manager::Instance()->GetAsInt("MonitorPort"))));	130	subscribers.push_back (can::Monitor::Pointer (new can::Monitor (config::Manager::Instance()->GetAsInt ("MonitorPort"))));
124	}	131	}
125		132
126	if (config::Manager::Instance()->Exist("DaemonPort"))	133	if (config::Manager::Instance()->Exist ("DaemonPort"))
127	{	134	{
128	subscribers.push_back(can::CanDaemon::Pointer(new can::CanDaemon(config::Manager::Instance()->GetAsInt("DaemonPort"))));	135	subscribers.push_back (can::CanDaemon::Pointer (new can::CanDaemon (config::Manager::Instance()->GetAsInt ("DaemonPort"))));
129	}	136	}
130		137
131	subscribers.push_back(control::Manager::Instance());	138	subscribers.push_back (control::Manager::Instance());
132		139
133	vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::System(vm::Manager::Instance()->GetIoService())));	140	vm::Manager::Instance()->AddPlugin (vm::Plugin::Pointer (new vm::plugin::System (vm::Manager::Instance()->GetIoService())));
134	vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::Console(vm::Manager::Instance()->GetIoService(), config::Manager::Instance()->GetAsInt("CommandPort"))));	141	vm::Manager::Instance()->AddPlugin (vm::Plugin::Pointer (new vm::plugin::Console (vm::Manager::Instance()->GetIoService(), config::Manager::Instance()->GetAsInt ("CommandPort"))));
135	vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::Storage(vm::Manager::Instance()->GetIoService())));	142	vm::Manager::Instance()->AddPlugin (vm::Plugin::Pointer (new vm::plugin::Storage (vm::Manager::Instance()->GetIoService())));
136	vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::Timer(vm::Manager::Instance()->GetIoService())));	143	vm::Manager::Instance()->AddPlugin (vm::Plugin::Pointer (new vm::plugin::Timer (vm::Manager::Instance()->GetIoService())));
137	vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::Module(vm::Manager::Instance()->GetIoService())));	144	vm::Manager::Instance()->AddPlugin (vm::Plugin::Pointer (new vm::plugin::Module (vm::Manager::Instance()->GetIoService())));
138	vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::Node(vm::Manager::Instance()->GetIoService())));	145	vm::Manager::Instance()->AddPlugin (vm::Plugin::Pointer (new vm::plugin::Node (vm::Manager::Instance()->GetIoService())));
139	vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::Socket(vm::Manager::Instance()->GetIoService())));	146	vm::Manager::Instance()->AddPlugin (vm::Plugin::Pointer (new vm::plugin::Socket (vm::Manager::Instance()->GetIoService())));
140		147
141	#ifdef USE_PLUGIN_XORG	148	#ifdef USE_PLUGIN_XORG
142	vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::Xorg(vm::Manager::Instance()->GetIoService())));	149	vm::Manager::Instance()->AddPlugin (vm::Plugin::Pointer (new vm::plugin::Xorg (vm::Manager::Instance()->GetIoService())));
143	#endif // USE_PLUGIN_XORG	150	#endif // USE_PLUGIN_XORG
144		151
145	vm::Manager::Instance()->Start(config::Manager::Instance()->GetAsString("ScriptPath"), config::Manager::Instance()->GetAsString("UserScriptPath"));	152	vm::Manager::Instance()->Start (config::Manager::Instance()->GetAsString ("ScriptPath"), config::Manager::Instance()->GetAsString ("UserScriptPath"));
146		153
147	if (config::Manager::Instance()->Exist("CanNet"))	154	if (config::Manager::Instance()->Exist ("CanNet"))
148	{	155	{
149	common::StringList cannetworks = config::Manager::Instance()->GetAsStringVector("CanNet");	156	common::StringList cannetworks = config::Manager::Instance()->GetAsStringVector ("CanNet");
150		157
151	for (uint n = 0; n < cannetworks.size(); n++)	158	for (uint n = 0; n < cannetworks.size(); n++)
152	{	159	{
153	subscribers.push_back(can::Network::Pointer(new can::Network(cannetworks[n])));	160	subscribers.push_back (can::Network::Pointer (new can::Network (cannetworks[n])));
154	}	161	}
155	}	162	}
156		163
157	boost::mutex::scoped_lock guard(guard_mutex);	164	boost::mutex::scoped_lock guard (guard_mutex);
-		165
158	on_message_condition.wait(guard);	166	on_message_condition.wait (guard);
159		167
160	LOG.Info("Cleaning up...");	168	LOG.Info ("Cleaning up...");
161		169
162	CleanUp();	170	CleanUp();
163		171
164	LOG.Info("Thank you for using Atom. Goodbye!");	172	LOG.Info ("Thank you for using Atom. Goodbye!");
165		173
166	return EXIT_SUCCESS;	174	return EXIT_SUCCESS;
167	}	175	}
168		176
169	void CleanUp()	177	void CleanUp()
170	{	178	{
-		179	net::Manager::Instance()->Stop();
-		180
171	subscribers.clear();	181	subscribers.clear();
172	config::Manager::Delete();	182	config::Manager::Delete();
173	timer::Manager::Delete();	183	timer::Manager::Delete();
174	control::Manager::Delete();	184	control::Manager::Delete();
175	vm::Manager::Delete();	185	mbb::Manager::Delete();
176	can::Protocol::Delete();	186	can::Protocol::Delete();
177	broker::Manager::Delete();	187	broker::Manager::Delete();
-		188	vm::Manager::Delete();
178	net::Manager::Delete();	189	net::Manager::Delete();
179	storage::Manager::Delete();	190	storage::Manager::Delete();
180	}	191	}
181		192
182	void Handler(int status)	193	void Handler (int status)
183	{	194	{
184	std::string signal_name = "Unknown";	195	std::string signal_name = "Unknown";
185		196
186	switch (status)	197	switch (status)
187	{	198	{
188	case SIGTERM:	199	case SIGTERM:
189	{	200	{
190	signal_name = "Terminate";	201	signal_name = "Terminate";
191	break;	202	break;
192	}	203	}
-		204
193	case SIGINT:	205	case SIGINT:
194	{	206	{
195	signal_name = "Interupt";	207	signal_name = "Interupt";
196	break;	208	break;
197	}	209	}
-		210
198	case SIGQUIT:	211	case SIGQUIT:
199	{	212	{
200	signal_name = "Quit";	213	signal_name = "Quit";
201	break;	214	break;
202	}	215	}
-		216
203	case SIGABRT:	217	case SIGABRT:
204	{	218	{
205	signal_name = "Abort";	219	signal_name = "Abort";
206	break;	220	break;
207	}	221	}
-		222
208	case SIGIO:	223	case SIGIO:
209	{	224	{
210	signal_name = "I/O";	225	signal_name = "I/O";
211	break;	226	break;
212	}	227	}
-		228
213	case SIGPIPE:	229	case SIGPIPE:
214	{	230	{
215	signal_name = "Pipe";	231	signal_name = "Pipe";
216	break;	232	break;
217	}	233	}
218	}	234	}
219		235
220	LOG.Debug("Received signal " + signal_name + "(" + boost::lexical_cast<std::string>(status) + ").");	236	LOG.Debug ("Received signal " + signal_name + "(" + boost::lexical_cast<std::string> (status) + ").");
221		237
222	if (status != SIGPIPE)	238	if (status != SIGPIPE)
223	{	239	{
224	on_message_condition.notify_all();	240	on_message_condition.notify_all();
225	}	241	}
226	}	242	}
227		-
228		243

Subversion Repositories HomeAutomation

(root)/trunk/PcSoftware/Atom1.5/src/atomd.cpp – Rev 1914 → 1939