diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-21 14:25:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-21 14:25:33 +0100 |
| commit | 6c9ee1f125dc45625eb32d08e623857058cf30ad (patch) | |
| tree | 17905ea2dfe3eaa6c5229c6c55d487e7a8c0ca46 /platform/osx | |
| parent | fee2f367afc234afa541667ab800e2f65297e6bc (diff) | |
| parent | d42c5646a584eb0a5ea469dc017a2892ed9b955a (diff) | |
| download | redot-engine-6c9ee1f125dc45625eb32d08e623857058cf30ad.tar.gz | |
Merge pull request #13133 from endragor/resurrect-file-logging
Return and repair file logging
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 cb6fff7855..781e8de1ab 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -1217,15 +1217,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]; @@ -2174,7 +2165,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) { |