ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-04 14:48:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some of the log code

Browse Source
This commit is contained in:
gingerBill
2020-06-19 15:18:23 +01:00
parent aeafed0218
commit 34384cc2f1
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/log/file_console_logger.odin
+21 -12
View File
@@ -60,9 +60,10 @@ destroy_console_logger :: proc(log: ^Logger) {
file_console_logger_proc :: proc(logger_data: rawptr, level: Level, text: string, options: Options, location := #caller_location) { file_console_logger_proc :: proc(logger_data: rawptr, level: Level, text: string, options: Options, location := #caller_location) {
data := cast(^File_Console_Logger_Data)logger_data; data := cast(^File_Console_Logger_Data)logger_data;
h: os.Handle; h: os.Handle = os.stdout if level <= Level.Error else os.stderr;
if(data.file_handle != os.INVALID_HANDLE) do h = data.file_handle; if data.file_handle != os.INVALID_HANDLE {
else do h = os.stdout if level <= Level.Error else os.stderr; h = data.file_handle;
}
backing: [1024]byte; //NOTE(Hoej): 1024 might be too much for a header backing, unless somebody has really long paths. backing: [1024]byte; //NOTE(Hoej): 1024 might be too much for a header backing, unless somebody has really long paths.
buf := strings.builder_from_slice(backing[:]); buf := strings.builder_from_slice(backing[:]);
@@ -74,8 +75,8 @@ file_console_logger_proc :: proc(logger_data: rawptr, level: Level, text: string
t := time.now(); t := time.now();
y, m, d := time.date(t); y, m, d := time.date(t);
h, min, s := time.clock(t); h, min, s := time.clock(t);
if Option.Date in options do fmt.sbprintf(&buf, "%d-%02d-%02d ", y, m, d); if .Date in options do fmt.sbprintf(&buf, "%d-%02d-%02d ", y, m, d);
if Option.Time in options do fmt.sbprintf(&buf, "%02d:%02d:%02d", h, min, s); if .Time in options do fmt.sbprintf(&buf, "%02d:%02d:%02d", h, min, s);
fmt.sbprint(&buf, "] "); fmt.sbprint(&buf, "] ");
} }
} }
@@ -115,21 +116,29 @@ do_location_header :: proc(opts: Options, buf: ^strings.Builder, location := #ca
file := location.file_path; file := location.file_path;
if .Short_File_Path in opts { if .Short_File_Path in opts {
last := 0; last := 0;
for r, i in location.file_path do if r == '/' do last = i+1; for r, i in location.file_path {
if r == '/' {
last = i+1;
}
}
file = location.file_path[last:]; file = location.file_path[last:];
} }
if Location_File_Opts & opts != nil do fmt.sbprint(buf, file); if Location_File_Opts & opts != nil {
fmt.sbprint(buf, file);
if .Procedure in opts {
if Location_File_Opts & opts != nil do fmt.sbprint(buf, ".");
fmt.sbprintf(buf, "%s()", location.procedure);
} }
if .Line in opts { if .Line in opts {
if Location_File_Opts & opts != nil || .Procedure in opts do fmt.sbprint(buf, ":"); if Location_File_Opts & opts != nil || .Procedure in opts do fmt.sbprint(buf, ":");
fmt.sbprint(buf, location.line); fmt.sbprint(buf, location.line);
} }
if .Procedure in opts {
if Location_File_Opts & opts != nil {
fmt.sbprint(buf, ".");
}
fmt.sbprintf(buf, "%s()", location.procedure);
}
fmt.sbprint(buf, "] "); fmt.sbprint(buf, "] ");
} }