diff options
| author | Jose <jose@zeroc.com> | 2019-05-29 22:08:27 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-05-29 22:08:27 +0200 |
| commit | fe9cf41fd22316fedd218aea56cd27f286fe09ec (patch) | |
| tree | 67a6e69ceb9dc27c76df02518c0bf767ad361d4a /cpp/src/Ice/Instance.cpp | |
| parent | Fix makeprops script (diff) | |
| download | ice-fe9cf41fd22316fedd218aea56cd27f286fe09ec.tar.bz2 ice-fe9cf41fd22316fedd218aea56cd27f286fe09ec.tar.xz ice-fe9cf41fd22316fedd218aea56cd27f286fe09ec.zip | |
Swift logger updates
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 8d448ee0ddb..0420d7cb7c2 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -51,6 +51,10 @@ #include <stdio.h> #include <list> +#ifdef __APPLE__ +# include <Ice/OSLogLoggerI.h> +#endif + #ifndef _WIN32 # include <Ice/SysLoggerI.h> # include <Ice/SystemdJournalI.h> @@ -1096,13 +1100,24 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi _initData.properties->getProperty("Ice.ProgramName"), _initData.properties->getPropertyWithDefault("Ice.SyslogFacility", "LOG_USER")); } -# ifdef ICE_USE_SYSTEMD - else if(_initData.properties->getPropertyAsInt("Ice.UseSystemdJournal") > 0) + else +#endif + +#ifdef __APPLE__ + if(!_initData.logger && _initData.properties->getPropertyAsInt("Ice.UseOSLog") > 0) + { + _initData.logger = ICE_MAKE_SHARED(OSLogLoggerI, + _initData.properties->getProperty("Ice.ProgramName")); + } + else +#endif + +#ifdef ICE_USE_SYSTEMD + if(_initData.properties->getPropertyAsInt("Ice.UseSystemdJournal") > 0) { _initData.logger = ICE_MAKE_SHARED(SystemdJournalI, _initData.properties->getProperty("Ice.ProgramName")); } -# endif else #endif if(!logfile.empty()) |