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/android | |
| parent | c846e49a7d3439d9aef5d499ad403304d89a3b3c (diff) | |
Return and repair file logging
And make it configurable, too.
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/os_android.cpp | 13 | ||||
| -rw-r--r-- | platform/android/os_android.h | 1 |
2 files changed, 3 insertions, 11 deletions
diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp index b2c8799540..b575f15559 100644 --- a/platform/android/os_android.cpp +++ b/platform/android/os_android.cpp @@ -114,15 +114,6 @@ void OS_Android::initialize_core() { #endif } -void OS_Android::initialize_logger() { - Vector<Logger *> loggers; - loggers.push_back(memnew(AndroidLogger)); - // 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_Android::set_opengl_extensions(const char *p_gl_extensions) { ERR_FAIL_COND(!p_gl_extensions); @@ -762,7 +753,9 @@ OS_Android::OS_Android(GFXInitFunc p_gfx_init_func, void *p_gfx_init_ud, OpenURI alert_func = p_alert_func; use_reload_hooks = false; - _set_logger(memnew(AndroidLogger)); + Vector<Logger *> loggers; + loggers.push_back(memnew(AndroidLogger)); + _set_logger(memnew(CompositeLogger(loggers))); } OS_Android::~OS_Android() { diff --git a/platform/android/os_android.h b/platform/android/os_android.h index d25f60d540..3b7f55096e 100644 --- a/platform/android/os_android.h +++ b/platform/android/os_android.h @@ -144,7 +144,6 @@ public: virtual int get_audio_driver_count() const; virtual const char *get_audio_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); |