diff options
Diffstat (limited to 'externals/ace/Service_Gestalt.h')
| -rw-r--r-- | externals/ace/Service_Gestalt.h | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/externals/ace/Service_Gestalt.h b/externals/ace/Service_Gestalt.h index a4bbbcbcda9..68a2ce7e7cc 100644 --- a/externals/ace/Service_Gestalt.h +++ b/externals/ace/Service_Gestalt.h @@ -4,7 +4,7 @@ /** * @file Service_Gestalt.h * - * $Id: Service_Gestalt.h 89501 2010-03-17 08:59:56Z vzykov $ + * $Id: Service_Gestalt.h 91158 2010-07-21 15:54:12Z mesnier_p $ * * @author Iliyan Jeliazkov <iliyan@ociweb.com> */ @@ -154,11 +154,19 @@ public: * specifies service directives without the need for a configuration * file. Can be specified multiple times. * - * Note: Options '-f' and '-S' complement each other. Directives from files - * and from '-S' option are processed together in the following order. First, - * all files are processed in the order they are specified in @a argv - * parameter. Second, all directive strings are executed in the order the - * directives appear in @a argv parameter. + * Note: Options '-f' and '-S' complement each other. Directives + * from files and from '-S' option are processed together in the + * following order. First, the default file "./svc.conf" is + * evaluated if not ignored, then all files are processed in the + * order they are specified in '-f' @a argv parameter. Finally, all + * '-S' directive strings are executed in the order the directives + * appear in @a argv parameter. + * + * If no files or directives are added via the '-f' and '-S' + * arguments, and the default file is not ignored, it will be + * evaluated whether it exists or not, possibly causing a failure + * return. If any other directives are added then the default file + * will be evaluated only if it exists. * * @param argc The number of commandline arguments. * @param argv The array with commandline arguments @@ -167,16 +175,16 @@ public: * socket address. * @param ignore_static_svcs If true then static services are not loaded, * otherwise, they are loaded. - * @param ignore_default_svc_conf_file If false then the @c svc.conf + * @param ignore_default_svc_conf_file If false then the @c ./svc.conf * configuration file will be ignored. * @param ignore_debug_flag If false then the application is responsible * for setting the @c ACE_Log_Msg::priority_mask * appropriately. * - * @retval -1 The configuration file is not found or cannot + * @retval -1 A configuration file is not found or cannot * be opened (errno is set accordingly). * @retval 0 Success. - * @retval >0 The number of errors encountered while processing + * @retval >0 The number of directive errors encountered while processing * the service configuration file(s). */ int open (int argc, @@ -252,7 +260,7 @@ public: * provided in the svc.conf file(s). Returns the number of errors * that occurred. */ - int process_directives (bool ignore_default_svc_conf_file); + int process_directives (bool defunct_option = false); /// Tidy up and perform last rites when ACE_Service_Config is shut /// down. This method calls @c close_svcs. Returns 0. @@ -335,13 +343,13 @@ protected: bool& ignore_default_svc_conf_file); /** - * Performs an open without parsing command-line arguments. The - * @a logger_key indicates where to write the logging output, which - * is typically either a STREAM pipe or a socket address. If - * @a ignore_default_svc_conf_file is non-0 then the "svc.conf" file - * will be ignored. If @a ignore_debug_flag is non-0 then the - * application is responsible for setting the - * @c ACE_Log_Msg::priority_mask() appropriately. Returns number of + * Performs an open without parsing command-line arguments. The @a + * logger_key indicates where to write the logging output, which is + * typically either a STREAM pipe or a socket address. If @a + * ignore_default_svc_conf_file is non-0 then the "svc.conf" file + * will not be added by default. If @a ignore_debug_flag is non-0 + * then the application is responsible for setting the @c + * ACE_Log_Msg::priority_mask() appropriately. Returns number of * errors that occurred on failure and 0 otherwise. */ int open_i (const ACE_TCHAR program_name[], |