Rev 1652 | Rev 1768 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed
| Rev 1652 | Rev 1656 | ||
|---|---|---|---|
| Line 30... | Line 30... | ||
| 30 | 30 | ||
| 31 | Manager::Pointer Manager::instance_; |
31 | Manager::Pointer Manager::instance_; |
| 32 | 32 | ||
| 33 | Manager::Manager() : command_line_("Command line options"), configuration_file_("Configuration file options") |
33 | Manager::Manager() : command_line_("Command line options"), configuration_file_("Configuration file options") |
| 34 | { |
34 | { |
| 35 | std::string default_config_file = "/etc/atom.conf"; |
35 | std::string default_config_file = "/etc/atom/atom.conf"; |
| 36 | 36 | ||
| 37 | if (!boost::filesystem::exists(default_config_file)) |
37 | if (!boost::filesystem::exists(default_config_file)) |
| 38 | { |
38 | { |
| 39 | default_config_file = "atom.conf"; |
39 | default_config_file = "atom.conf"; |
| 40 | } |
40 | } |
| Line 43... | Line 43... | ||
| 43 | ("MonitorPort", boost::program_options::value<int>()->default_value(1201), "TCP port to open for monitor output") |
43 | ("MonitorPort", boost::program_options::value<int>()->default_value(1201), "TCP port to open for monitor output") |
| 44 | ("CommandPort", boost::program_options::value<int>()->default_value(1202), "TCP port to open for command input") |
44 | ("CommandPort", boost::program_options::value<int>()->default_value(1202), "TCP port to open for command input") |
| 45 | ("LogFile", boost::program_options::value<std::string>(), "File to log output to") |
45 | ("LogFile", boost::program_options::value<std::string>(), "File to log output to") |
| 46 | ("LogLevel", boost::program_options::value<int>()->default_value(4), "Level of logging") |
46 | ("LogLevel", boost::program_options::value<int>()->default_value(4), "Level of logging") |
| 47 | ("ScriptPath", boost::program_options::value<std::string>(), "Path to where the scripts are") |
47 | ("ScriptPath", boost::program_options::value<std::string>(), "Path to where the scripts are") |
| - | 48 | ("UserScriptPath",boost::program_options::value<std::string>(), "Path to where the user scripts are") |
|
| 48 | ("StoragePath", boost::program_options::value<std::string>(), "Path to where the storage files are") |
49 | ("StoragePath", boost::program_options::value<std::string>(), "Path to where the storage files are") |
| 49 | ("ProtocolFile",boost::program_options::value<std::string>(), "File to read the protocol form") |
50 | ("ProtocolFile", boost::program_options::value<std::string>(), "File to read the protocol form") |
| 50 | ("CanNet", boost::program_options::value<common::StringList>(), "Information on where to locate the CAN networks") |
51 | ("CanNet", boost::program_options::value<common::StringList>(), "Information on where to locate the CAN networks") |
| 51 | ("Legacy", "Start legacy VM environment"); |
52 | ("Legacy", "Start legacy VM environment"); |
| 52 | 53 | ||