summaryrefslogtreecommitdiff
path: root/src/log
diff options
context:
space:
mode:
authorJanusz Kozerski <j.kozerski@samsung.com>2015-05-15 14:11:30 +0200
committerKrzysztof Jackiewicz <k.jackiewicz@samsung.com>2015-05-27 13:20:03 +0200
commite1301082a4c40852dde8500b18bb2f3df88fac8f (patch)
treec7d75759c71082187877437b92afb3caefd8b7b5 /src/log
parentcd3abbff7768fc93a4b7f045fa040ccf0a418e27 (diff)
downloadcert-checker-e1301082a4c40852dde8500b18bb2f3df88fac8f.tar.gz
cert-checker-e1301082a4c40852dde8500b18bb2f3df88fac8f.tar.bz2
cert-checker-e1301082a4c40852dde8500b18bb2f3df88fac8f.zip
Add classes: Logic, App_t. Add journal loging support
Class Logic has only dbus callbacks implemetation (package-manager, connman), beside it it's empty implementation. Verification: 1) Build cert-checker with debug, and install on emulator. 2) Run cert-checker - do it in emulator UI console (not via ssh). 3) On other console in emulator UI run command: journalctl -f | grep cert-checker - to see the logs. 4) On third console turn on and off offline mode on device: /usr/sbin/connmanctl enable offline /usr/sbin/connmanctl disable offline 5) You should see logs from cert-checker in journal 6) Install any app to check if package-manager signal works in cert-checker: pkgcmd -i -t wgt -p /usr/share/widget_demo/go.wgt -q 7) Check if logs are present. Change-Id: Ic7d6fc4f47ca9ced18744ad8a77f8516b75304e3
Diffstat (limited to 'src/log')
-rw-r--r--src/log/log.cpp49
-rw-r--r--src/log/log.h86
2 files changed, 135 insertions, 0 deletions
diff --git a/src/log/log.cpp b/src/log/log.cpp
new file mode 100644
index 0000000..ced0fe9
--- /dev/null
+++ b/src/log/log.cpp
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file log.cpp
+ * @author Janusz Kozerski <j.kozerski@samsung.com>
+ * @brief This file declares class for ask user window
+ */
+
+#include <stdexcept>
+#include <systemd/sd-journal.h>
+
+void JournalLog(int logLevel,
+ const char *message,
+ const char *fileName,
+ int line,
+ const char *function)
+{
+ try {
+ sd_journal_send("PRIORITY=%d", logLevel,
+ "CODE_FILE=%s", fileName,
+ "CODE_FUNC=%s", function,
+ "CODE_LINE=%d", line,
+ // add file, line & function info to log message
+ "MESSAGE=[%s:%d] %s(): %s", fileName, line, function, message,
+ NULL);
+ } catch (const std::out_of_range&) {
+ sd_journal_send(
+ "PRIORITY=%d", LOG_ERR,
+ "CODE_FILE=%s", fileName,
+ "CODE_FUNC=%s", function,
+ "CODE_LINE=%d", line,
+ // add file, line & function info to log message
+ "MESSAGE=[%s:%d] %s(): Unsupported log level %d", fileName, line, function, logLevel,
+ NULL);
+ }
+}
diff --git a/src/log/log.h b/src/log/log.h
new file mode 100644
index 0000000..d4efcdc
--- /dev/null
+++ b/src/log/log.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file log.h
+ * @author Janusz Kozerski <j.kozerski@samsung.com>
+ * @brief Project log framework - logs into journal
+ */
+
+#include <sstream>
+#include <systemd/sd-journal.h>
+
+#ifndef CERT_CHECKER_LOG_H
+#define CERT_CHECKER_LOG_H
+
+void JournalLog(int logLevel, const char *message, const char *fileName,
+ int line, const char *function);
+
+/*
+ * Replacement low overhead null logging class
+ */
+class NullStream
+{
+ public:
+ NullStream() {}
+
+ template <typename T>
+ NullStream& operator<<(const T&)
+ {
+ return *this;
+ }
+};
+
+/* avoid warnings about unused variables */
+#define DPL_MACRO_DUMMY_LOGGING(message, level) \
+ do { \
+ NullStream ns; \
+ ns << message; \
+ } while (0)
+
+#define CERT_CHECKER_LOG(message, level) \
+do \
+{ \
+ std::ostringstream platformLog; \
+ platformLog << message; \
+ JournalLog(level, \
+ platformLog.str().c_str(), \
+ __FILE__, \
+ __LINE__, \
+ __FUNCTION__); \
+} while (0)
+
+/* Errors must be always logged. */
+#define LogError(message) \
+ CERT_CHECKER_LOG(message, LOG_ERR)
+
+#ifdef BUILD_TYPE_DEBUG
+ #define LogDebug(message) \
+ CERT_CHECKER_LOG(message, LOG_DEBUG)
+ #define LogInfo(message) \
+ CERT_CHECKER_LOG(message, LOG_INFO)
+ #define LogWarning(message) \
+ CERT_CHECKER_LOG(message, LOG_WARNING)
+#else
+ #define LogDebug(message) \
+ DPL_MACRO_DUMMY_LOGGING(message, LOG_DEBUG)
+ #define LogInfo(message) \
+ DPL_MACRO_DUMMY_LOGGING(message, LOG_INFO)
+ #define LogWarning(message) \
+ DPL_MACRO_DUMMY_LOGGING(message, LOG_WARNING)
+#endif // BUILD_TYPE_DEBUG
+
+#endif //CERT_CHECKER_LOG_H
+