summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1998-10-17 05:35:15 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1998-10-17 05:35:15 +0000
commite1186a3ec826b457a4b475514c168a04eccdca87 (patch)
tree99dff26a1d575b59df275ea535de0b7059a17b0d
parentc7168fc1d4f11274d3cddb5fc77966c616724321 (diff)
downloadATCD-e1186a3ec826b457a4b475514c168a04eccdca87.tar.gz
.
-rw-r--r--ace/Service_Config.cpp11
-rw-r--r--examples/Service_Configurator/Misc/main.cpp7
2 files changed, 11 insertions, 7 deletions
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index e6abc29bac5..8976d5652b5 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -420,11 +420,12 @@ ACE_Service_Config::process_directives (void)
{
// Invalid svc.conf file. We'll report it here and
// break out of the method.
- ACE_ERROR ((LM_ERROR,
- ASYS_TEXT ("%p\n"),
- // @@ Beware of the WString here... Not
- // sure how to fix this with %p...
- ASYS_TEXT (sptr->fast_rep ())));
+ if (ACE::debug ())
+ ACE_DEBUG ((LM_DEBUG,
+ ASYS_TEXT ("%p\n"),
+ // @@ Beware of the WString here... Not
+ // sure how to fix this with %p...
+ ASYS_TEXT (sptr->fast_rep ())));
errno = ENOENT;
return -1;
}
diff --git a/examples/Service_Configurator/Misc/main.cpp b/examples/Service_Configurator/Misc/main.cpp
index 9ddfae1cc2f..d6946e8fdc8 100644
--- a/examples/Service_Configurator/Misc/main.cpp
+++ b/examples/Service_Configurator/Misc/main.cpp
@@ -42,9 +42,12 @@ main (int, ASYS_TCHAR *argv[])
l_argv[3] = ASYS_TEXT ("static Timer_Service_1 \"timer 1 10 $TRACE\"");
l_argv[4] = ASYS_TEXT ("-S");
l_argv[5] = ASYS_TEXT ("dynamic Timer_Service_2 Service_Object * ./Timer:_make_Timer_Service_2() \"timer 2 10 $TRACE\"");
- l_argv[6] = 0;
+ // Use the -f option twice to test this feature!
+ l_argv[6] = ASYS_TEXT ("-fsvc.conf");
+ l_argv[7] = ASYS_TEXT ("-fsvc.conf");
+ l_argv[8] = 0;
- if (ACE_Service_Config::open (6, l_argv) == -1 && errno != ENOENT)
+ if (ACE_Service_Config::open (8, l_argv) == -1 && errno != ENOENT)
ACE_ERROR_RETURN ((LM_ERROR,
ASYS_TEXT ("%p\n"),
ASYS_TEXT ("open")),