diff options
| -rw-r--r-- | common/syslogd/include/logging.h | 2 | ||||
| -rw-r--r-- | common/syslogd/src/logging.cpp | 4 | ||||
| -rw-r--r-- | program/src/cert_store.cpp | 6 | ||||
| -rw-r--r-- | vendor/CMakeLists.txt | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/common/syslogd/include/logging.h b/common/syslogd/include/logging.h index 8d3ac35..19f1dae 100644 --- a/common/syslogd/include/logging.h +++ b/common/syslogd/include/logging.h @@ -46,6 +46,6 @@ extern void mesa_logging_print(int log_level, const char *module, const char *ms #define mesa_runtime_log(level, module, ...) mesa_log(logging_sc_lid.debug_switch, level, module, __VA_ARGS__) -void cert_syslog_init(const char *config); +void cert_syslog_init(const char *config, const char * version); #endif diff --git a/common/syslogd/src/logging.cpp b/common/syslogd/src/logging.cpp index 751d239..19c5a92 100644 --- a/common/syslogd/src/logging.cpp +++ b/common/syslogd/src/logging.cpp @@ -31,7 +31,7 @@ void mesa_logging_print(int log_level, const char *module, const char *msg) return; } -void cert_syslog_init(const char *config) +void cert_syslog_init(const char *config, const char * version) { struct breakpad_instance *breakpad; @@ -56,7 +56,7 @@ void cert_syslog_init(const char *config) mesa_runtime_log(RLOG_LV_INFO, MODULE_NAME, "Log module initialization"); } - breakpad = breakpad_init(config, "breakpad", logging_sc_lid.run_log_handle); + breakpad = breakpad_init(config, "breakpad", logging_sc_lid.run_log_handle, version); if(breakpad == NULL) { mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "Failed at starting breakpad."); diff --git a/program/src/cert_store.cpp b/program/src/cert_store.cpp index 747a6a7..efc55a8 100644 --- a/program/src/cert_store.cpp +++ b/program/src/cert_store.cpp @@ -83,14 +83,14 @@ int main(int argc, char **argv) break; } } - cert_syslog_init(CERT_BASIC_CFG); + cert_syslog_init(CERT_BASIC_CFG, version()); cert_init_config(CERT_BASIC_CFG); cert_preview(); - + mesa_runtime_log(RLOG_LV_INFO, MODULE_NAME, "Cert server init success"); - + cert_session_init(); signal(SIGINT, sigproc); diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index ff63aff..b9fd592 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -152,7 +152,7 @@ set_property(TARGET MESA_field_stat PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_ set_property(TARGET MESA_field_stat PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR}) add_library(breakpad_mini SHARED IMPORTED GLOBAL) -set_property(TARGET breakpad_mini PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/lib/libbreakpad_mini.so) +set_property(TARGET breakpad_mini PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/libbreakpad_mini.so) set_property(TARGET breakpad_mini PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR}) |