diff options
| author | Ruslan Mustakov <ruslan.mustakov@xored.com> | 2017-11-21 16:35:01 +0700 |
|---|---|---|
| committer | Ruslan Mustakov <ruslan.mustakov@xored.com> | 2017-11-21 16:43:44 +0700 |
| commit | d42c5646a584eb0a5ea469dc017a2892ed9b955a (patch) | |
| tree | 5ea374a13a486f80e849d1ead15711275da912f0 /platform/osx | |
| parent | c846e49a7d3439d9aef5d499ad403304d89a3b3c (diff) | |
| download | redot-engine-d42c5646a584eb0a5ea469dc017a2892ed9b955a.tar.gz | |
Return and repair file logging
And make it configurable, too.
Diffstat (limited to 'platform/osx')
| -rw-r--r-- | platform/osx/os_osx.h | 1 | ||||
| -rw-r--r-- | platform/osx/os_osx.mm | 13 |
2 files changed, 3 insertions, 11 deletions
diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h index aa8ee1fe83..9a740a7bea 100644 --- a/platform/osx/os_osx.h +++ b/platform/osx/os_osx.h @@ -121,7 +121,6 @@ protected: virtual int get_video_driver_count() const; virtual const char *get_video_driver_name(int p_driver) const; - virtual void initialize_logger(); virtual void initialize_core(); virtual void initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver); virtual void finalize(); diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 110cb776ee..9213f378b3 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -1185,15 +1185,6 @@ public: typedef UnixTerminalLogger OSXTerminalLogger; #endif -void OS_OSX::initialize_logger() { - Vector<Logger *> loggers; - loggers.push_back(memnew(OSXTerminalLogger)); - // FIXME: Reenable once we figure out how to get this properly in user:// - // instead of littering the user's working dirs (res:// + pwd) with log files (GH-12277) - //loggers.push_back(memnew(RotatedFileLogger("user://logs/log.txt"))); - _set_logger(memnew(CompositeLogger(loggers))); -} - void OS_OSX::alert(const String &p_alert, const String &p_title) { // Set OS X-compliant variables NSAlert *window = [[NSAlert alloc] init]; @@ -2142,7 +2133,9 @@ OS_OSX::OS_OSX() { window_size = Vector2(1024, 600); zoomed = false; - _set_logger(memnew(OSXTerminalLogger)); + Vector<Logger *> loggers; + loggers.push_back(memnew(OSXTerminalLogger)); + _set_logger(memnew(CompositeLogger(loggers))); } bool OS_OSX::_check_internal_feature_support(const String &p_feature) { |