diff options
Diffstat (limited to 'PyArcWelder/py_logger.cpp')
| -rw-r--r-- | PyArcWelder/py_logger.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/PyArcWelder/py_logger.cpp b/PyArcWelder/py_logger.cpp index 0418ef5..3269c42 100644 --- a/PyArcWelder/py_logger.cpp +++ b/PyArcWelder/py_logger.cpp @@ -119,7 +119,7 @@ void py_logger::set_internal_log_levels(bool check_real_time) void py_logger::log_exception(const int logger_type, const std::string& message) { - log(logger_type, ERROR, message, true); + log(logger_type, log_levels::ERROR, message, true); } void py_logger::log(const int logger_type, const int log_level, const std::string& message) @@ -176,24 +176,24 @@ void py_logger::log(const int logger_type, const int log_level, const std::strin } else { - switch (log_level) + switch ((log_levels)log_level) { - case INFO: + case log_levels::INFO: pyFunctionName = py_info_function_name; break; - case WARNING: + case log_levels::WARNING: pyFunctionName = py_warn_function_name; break; - case ERROR: + case log_levels::ERROR: pyFunctionName = py_error_function_name; break; - case DEBUG: + case log_levels::DEBUG: pyFunctionName = py_debug_function_name; break; - case VERBOSE: + case log_levels::VERBOSE: pyFunctionName = py_verbose_function_name; break; - case CRITICAL: + case log_levels::CRITICAL: pyFunctionName = py_critical_function_name; break; default: @@ -203,7 +203,9 @@ void py_logger::log(const int logger_type, const int log_level, const std::strin return; } } - PyObject* pyMessage = gcode_arc_converter::PyBytesOrString_FromString(message); + //PyObject* pyMessage = gcode_arc_converter::PyBytesOrString_FromString(message); + PyObject* pyMessage = gcode_arc_converter::PyUnicode_SafeFromString(message); + if (pyMessage == NULL) { std::cout << "Unable to convert the log message '" << message.c_str() << "' to a PyString/Unicode message.\r\n"; |