globally updated help

Utilities/SImitator/main.cc

@@ -8,13 +8,13 @@ using namespace uniset;
 void help_print()
 {
     cout << endl;
-    cout << "--confile configure.xml. По умолчанию: configure.xml." << endl;
     cout << "--sid id1@Node1,id2,..,idXX@NodeXX  - Аналоговые датчики (AI,AO)" << endl;
     cout << endl;
     cout << "--min val       - Нижняя граница датчика. По умолчанию 0" << endl;
     cout << "--max val       - Верхняя граница датчика. По умолчанию 100 " << endl;
     cout << "--step val      - Шаг датчика. По умолчанию 1" << endl;
     cout << "--pause msec    - Пауза. По умолчанию 200 мсек" << endl << endl;
+    cout << uniset::Configuration::help() << endl;
 }
 // -----------------------------------------------------------------------------
 struct ExtInfo:

Utilities/SMonit/smonitor.cc

@@ -17,9 +17,9 @@ int main( int argc, const char** argv )
         {
             cout << "Usage: uniset-smonit [ args ] --sid id1@node1,Sensor2@node2,id2,sensorname3,... " << endl
                  << "Args: " << endl
-                 << " --confile confilename - Default: configure.xml" << endl
-                 << " --name XXX - name for smonit. Default: TestProc" << endl;
+                 << "--name XXX - name for smonit. Default: TestProc" << endl;
             //                 << " --script scriptname \n"
+            cout << uniset::Configuration::help() << endl;
             return 0;
         }
 

Utilities/SViewer-text/main.cc

@@ -9,6 +9,8 @@ using namespace std;
 static void short_usage()
 {
     cout << "Usage: uniset-sviewer-text [--fullname] [--polltime msec] [--confile uniset-confile]\n";
+    cout << endl;
+    cout << uniset::Configuration::help() << endl;
 }
 // --------------------------------------------------------------------------
 int main(int argc, const char** argv)
@@ -17,7 +19,7 @@ int main(int argc, const char** argv)
 
     try
     {
-        if( argc > 1 && !strcmp(argv[1], "--help") )
+        if( argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")) )
         {
             short_usage();
             return 0;

extensions/Backend-OpenTSDB/main.cc

@@ -15,10 +15,14 @@ int main( int argc, const char** argv )
 
     if( argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")) )
     {
+        cout << endl;
+        cout << "Usage: uniset2-opentsdb-dbserver --confile configure.xml args1 args2" << endl;
+        cout << endl;
         cout << "--smemory-id objectName  - SharedMemory objectID. Default: autodetect" << endl;
-        cout << "--confile filename       - configuration file. Default: configure.xml" << endl;
         cout << endl;
         BackendOpenTSDB::help_print(argc, argv);
+        cout << " Global options:" << endl;
+        cout << uniset::Configuration::help() << endl;
         return 0;
     }
 

extensions/DBServer-MySQL/main.cc

@@ -14,8 +14,12 @@ int main(int argc, char** argv)
     {
         if( argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")) )
         {
-            cout << "--confile filename       - configuration file. Default: configure.xml" << endl;
+            cout << endl;
+            cout << "Usage: uniset2-mysql-dbserver --confile configure.xml args1 args2" << endl;
+            cout << endl;
             DBServer_MySQL::help_print(argc, argv);
+            cout << " Global options:" << endl;
+            cout << uniset::Configuration::help() << endl;
             return 0;
         }
 

extensions/DBServer-PostgreSQL/main.cc

@@ -14,8 +14,12 @@ int main(int argc, char** argv)
     {
         if( argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")) )
         {
-            cout << "--confile filename       - configuration file. Default: configure.xml" << endl;
+            cout << endl;
+            cout << "Usage: uniset2-pgsql-dbserver --confile configure.xml args1 args2" << endl;
+            cout << endl;
             DBServer_PostgreSQL::help_print(argc, argv);
+            cout << " Global options:" << endl;
+            cout << uniset::Configuration::help() << endl;
             return 0;
         }
 

extensions/DBServer-SQLite/DBServer_SQLite.cc

@@ -437,6 +437,7 @@ void DBServer_SQLite::help_print( int argc, const char* const* argv )
 {
     cout << "Default: prefix='sqlite'" << endl;
     cout << "--prefix-name objectID     - ObjectID. Default: 'conf->getDBServer()'" << endl;
+    cout << endl;
     cout << DBServer::help_print() << endl;
 }
 // -----------------------------------------------------------------------------

extensions/DBServer-SQLite/main.cc

@@ -14,8 +14,12 @@ int main(int argc, char** argv)
     {
         if( argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")) )
         {
-            cout << "--confile filename       - configuration file. Default: configure.xml" << endl;
+            cout << endl;
+            cout << "Usage: uniset2-sqlite-dbserver --confile configure.xml args1 args2" << endl;
+            cout << endl;
             DBServer_SQLite::help_print(argc, argv);
+            cout << " Global options:" << endl;
+            cout << uniset::Configuration::help() << endl;
             return 0;
         }
 

extensions/HttpResolver/main.cc

@@ -12,7 +12,11 @@ int main(int argc, char** argv)
     {
         if( argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")) )
         {
+            cout << endl;
+            cout << "Usage: uniset2-httpresolver args1 args2" << endl;
+            cout << endl;
             cout << "--confile filename - configuration file. Default: configure.xml" << endl;
+            cout << endl;
             HttpResolver::help_print();
             return 0;
         }

extensions/IOControl/iocontrol.cc

@@ -29,11 +29,16 @@ int main(int argc, const char** argv)
 {
     //  std::ios::sync_with_stdio(false);
 
-    if( argc > 1 && strcmp(argv[1], "--help") == 0 )
+    if( argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")) )
     {
-        cout << "--io-confile    - Использовать указанный конф. файл. По умолчанию configure.xml" << endl;
-        cout << "--io-logfile fname    - выводить логи в файл fname. По умолчанию iocontrol.log" << endl;
+        cout << endl;
+        cout << "Usage: uniset2-iocontrol args1 args2" << endl;
+        cout << endl;
+        cout << "--io-confile       - Использовать указанный конф. файл. По умолчанию configure.xml" << endl;
+        cout << "--io-logfile fname - выводить логи в файл fname. По умолчанию iocontrol.log" << endl;
         IOControl::help_print(argc, argv);
+        cout << "Global options:" << endl;
+        cout << uniset::Configuration::help() << endl;
         return 0;
     }
 

extensions/LogDB/main.cc

@@ -12,7 +12,7 @@ int main(int argc, char** argv)
     {
         if( argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")) )
         {
-            cout << "--confile filename       - configuration file. Default: configure.xml" << endl;
+            cout << "--confile filename - configuration file. Default: configure.xml" << endl;
             LogDB::help_print();
             return 0;
         }

extensions/LogicProcessor/logicproc.cc

@@ -29,6 +29,18 @@ int main(int argc, const char** argv)
 
     try
     {
+        if( argc > 1 && ( strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-h") == 0 ) )
+        {
+            cout << endl;
+            cout << "Usage: uniset2-logicproc args1 args2" << endl;
+            cout << endl;
+            cout << "--sleepTime msec        - Время между шагам рассчёта. По умолчанию: 200 милисек" << endl;
+            cout << "--sm-ready-timeout msec - Максимальное время ожидания готовности SharedMemory к работе, перед началом работы. По умолчанию: 2 минуты" << endl;
+            cout << endl;
+            cout << uniset::Configuration::help() << endl;
+            return 0;
+        }
+
         auto conf = uniset_init( argc, argv );
 
         string logfilename(conf->getArgParam("--logicproc-logfile"));

extensions/LogicProcessor/plogicproc.cc

@@ -31,11 +31,17 @@ int main(int argc, const char** argv)
 
     if( argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")) )
     {
-        cout << "--smemory-id objectName  - SharedMemory objectID. Default: autodetect" << endl;
-        cout << "--confile filename       - configuration file. Default: configure.xml" << endl;
-        cout << "--plproc-logfile filename   - logfilename. Default: mbslave.log" << endl;
+        cout << endl;
+        cout << "Usage: uniset2-plogicproc args1 args2" << endl;
+        cout << endl;
+        cout << "--smemory-id objectName   - SharedMemory objectID. Default: autodetect" << endl;
+        cout << "--confile filename        - configuration file. Default: configure.xml" << endl;
+        cout << "--plproc-logfile filename - logfilename. Default: mbslave.log" << endl;
         cout << endl;
         PassiveLProcessor::help_print(argc, argv);
+        cout << endl;
+        cout << "Global options:" << endl;
+        cout << uniset::Configuration::help() << endl;
         return 0;
     }
 

extensions/MQTTPublisher/main.cc

@@ -31,10 +31,14 @@ int main( int argc, const char** argv )
 
     if( argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")) )
     {
+        cout << endl;
+        cout << "Usage: uniset2-mqttpulisher --confile configure.xml args1 args2" << endl;
+        cout << endl;
         cout << "--smemory-id objectName  - SharedMemory objectID. Default: autodetect" << endl;
-        cout << "--confile filename       - configuration file. Default: configure.xml" << endl;
         cout << endl;
         MQTTPublisher::help_print(argc, argv);
+        cout << " Global options:" << endl;
+        cout << uniset::Configuration::help() << endl;
         return 0;
     }
 

extensions/ModbusMaster/main.cc

@@ -15,10 +15,16 @@ int main( int argc, const char** argv )
 
     if( argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")) )
     {
+        cout << endl;
+        cout << "Usage: uniset2-mbtcpmaster args1 args2" << endl;
+        cout << endl;
         cout << "--smemory-id objectName  - SharedMemory objectID. Default: autodetect" << endl;
         cout << "--confile filename       - configuration file. Default: configure.xml" << endl;
         cout << endl;
         MBTCPMaster::help_print(argc, argv);
+        cout << endl;
+        cout << " Global options:" << endl;
+        cout << uniset::Configuration::help() << endl;
         return 0;
     }
 

extensions/ModbusMaster/multi-main.cc

@@ -29,10 +29,16 @@ int main( int argc, const char** argv )
 {
     if( argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")) )
     {
+        cout << endl;
+        cout << "Usage: uniset2-mbtcpmultimaster args1 args2" << endl;
+        cout << endl;
         cout << "--smemory-id objectName  - SharedMemory objectID. Default: get from configure..." << endl;
         cout << "--confile filename       - configuration file. Default: configure.xml" << endl;
         cout << endl;
         MBTCPMultiMaster::help_print(argc, argv);
+        cout << endl;
+        cout << " Global options:" << endl;
+        cout << uniset::Configuration::help() << endl;
         return 0;
     }
 

extensions/ModbusSlave/mbslave.cc

@@ -33,10 +33,15 @@ int main(int argc, const char** argv)
 
     if( argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")) )
     {
+        cout << endl;
+        cout << "Usage: uniset2-mbslave args1 args2" << endl;
+        cout << endl;
         cout << "--smemory-id objectName  - SharedMemory objectID. Default: autodetect" << endl;
         cout << "--confile filename       - configuration file. Default: configure.xml" << endl;
         cout << endl;
         MBSlave::help_print(argc, argv);
+        cout << " Global options:" << endl;
+        cout << uniset::Configuration::help() << endl;
         return 0;
     }
 

extensions/RRDServer/main.cc

@@ -15,11 +15,15 @@ int main( int argc, const char** argv )
 
     if( argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")) )
     {
-        cout << "--smemory-id objectName  - SharedMemory objectID. Default: autodetect" << endl;
-        cout << "--confile filename       - configuration file. Default: configure.xml" << endl;
-        cout << "--rrdstorage-logfile filename    - logfilename. Default: rrdstorage.log" << endl;
+        cout << endl;
+        cout << "Usage: uniset2-rrdserver args1 args2" << endl;
+        cout << endl;
+        cout << "--smemory-id objectName       - SharedMemory objectID. Default: autodetect" << endl;
+        cout << "--rrdstorage-logfile filename - logfilename. Default: rrdstorage.log" << endl;
         cout << endl;
         RRDServer::help_print(argc, argv);
+        cout << " Global options:" << endl;
+        cout << uniset::Configuration::help() << endl;
         return 0;
     }
 

extensions/SMViewer/main.cc

@@ -13,8 +13,13 @@ int main( int argc, const char** argv )
     {
         if( argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")) )
         {
+            cout << endl;
+            cout << "Usage: uniset2-smviewer --confile configure.xml args1 args2" << endl;
+            cout << endl;
             cout << "--smemory-id objectName  - SharedMemory objectID. Default: read from <SharedMemory>" << endl;
-            cout << "--confile filename       - configuration file. Default: configure.xml" << endl;
+            cout << endl;
+            cout << "Global options:" << endl;
+            cout << uniset::Configuration::help() << endl;
             return 0;
         }
 

extensions/SharedMemory/smemory.cc

@@ -30,8 +30,11 @@ int main(int argc, const char** argv)
 
     if( argc > 1 && ( strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-h") == 0 ) )
     {
-        cout << "--confile    - Использовать указанный конф. файл. По умолчанию configure.xml" << endl;
+        cout << endl;
+        cout << "Usage: uniset2-smemory args1 args2" << endl;
+        cout << endl;
         SharedMemory::help_print(argc, argv);
+        cout << uniset::Configuration::help() << endl;
         return 0;
     }
 

extensions/UNetUDP/unetexchange.cc

@@ -15,10 +15,14 @@ int main( int argc, const char** argv )
     {
         if( argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")) )
         {
+            cout << endl;
+            cout << "Usage: uniset2-unetexchange --confile configure.xml args1 args2" << endl;
+            cout << endl;
             cout << "--smemory-id objectName  - SharedMemory objectID. Default: read from <SharedMemory>" << endl;
-            cout << "--confile filename       - configuration file. Default: configure.xml" << endl;
             cout << endl;
             UNetExchange::help_print(argc, argv);
+            cout << " Global options:" << endl;
+            cout << uniset::Configuration::help() << endl;
             return 0;
         }
 

src/Core/Configuration.cc

@@ -56,7 +56,7 @@ static ostream& print_help( ostream& os, int width, const string& cmd,
 std::string uniset::Configuration::help()
 {
 	ostringstream os;
-	print_help(os, 25, "--confile", "полный путь до файла конфигурации\n");
+	print_help(os, 25, "--confile", "Файл конфигурации. По умолчанию: configure.xml\n");
 	print_help(os, 25, "--uniport num", "использовать заданный порт (переопределяет 'port заданный в конф. файле в разделе <nodes><node.. port=''>)\n");
 	print_help(os, 25, "--localIOR {1,0}", "использовать локальные файлы для получения IOR (т.е. не использовать omniNames). Переопределяет параметр в конфигурационном файле.\n");
 	print_help(os, 25, "--transientIOR {1,0}", "использовать генерируемые IOR(не постоянные). Переопределяет параметр в конфигурационном файле. Default=0\n");