summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRuslan Mustakov <ruslan.mustakov@xored.com>2017-11-21 16:35:01 +0700
committerRuslan Mustakov <ruslan.mustakov@xored.com>2017-11-21 16:43:44 +0700
commitd42c5646a584eb0a5ea469dc017a2892ed9b955a (patch)
tree5ea374a13a486f80e849d1ead15711275da912f0 /drivers
parentc846e49a7d3439d9aef5d499ad403304d89a3b3c (diff)
Return and repair file logging
And make it configurable, too.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/unix/os_unix.cpp15
-rw-r--r--drivers/unix/os_unix.h3
2 files changed, 8 insertions, 10 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp
index ce0967af2c..0d102902e8 100644
--- a/drivers/unix/os_unix.cpp
+++ b/drivers/unix/os_unix.cpp
@@ -133,15 +133,6 @@ void OS_Unix::initialize_core() {
}
}
-void OS_Unix::initialize_logger() {
- Vector<Logger *> loggers;
- loggers.push_back(memnew(UnixTerminalLogger));
- // 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_Unix::finalize_core() {
}
@@ -543,4 +534,10 @@ void UnixTerminalLogger::log_error(const char *p_function, const char *p_file, i
UnixTerminalLogger::~UnixTerminalLogger() {}
+OS_Unix::OS_Unix() {
+ Vector<Logger *> loggers;
+ loggers.push_back(memnew(UnixTerminalLogger));
+ _set_logger(memnew(CompositeLogger(loggers)));
+}
+
#endif
diff --git a/drivers/unix/os_unix.h b/drivers/unix/os_unix.h
index 432f48408f..5b3fb824f0 100644
--- a/drivers/unix/os_unix.h
+++ b/drivers/unix/os_unix.h
@@ -53,7 +53,6 @@ protected:
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 int unix_initialize_audio(int p_audio_driver);
//virtual void initialize(int p_video_driver,int p_audio_driver);
@@ -63,6 +62,8 @@ protected:
String stdin_buf;
public:
+ OS_Unix();
+
virtual void alert(const String &p_alert, const String &p_title = "ALERT!");
virtual String get_stdin_string(bool p_block);