fix: unvail "error,fail" log output

due to app_error list Log: modify "error,fail" to unsucess in logdata
linuxdeepin · Jul 31, 2024 · c29340b · c29340b
1 parent 9ae5209
commit c29340b
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 21 deletions.
diff --git a/deepin-system-monitor-main/3rdparty/include/closestream.h b/deepin-system-monitor-main/3rdparty/include/closestream.h
@@ -67,9 +67,9 @@ close_stdout(void)
 {
 	if (flush_standard_stream(stdout) != 0 && !(errno == EPIPE)) {
 		if (errno)
-			warn(_("write error"));
+			warn(_("write unsuccess"));
 		else
-			warnx(_("write error"));
+			warnx(_("write unsuccess"));
 		_exit(CLOSE_EXIT_CODE);
 	}
 

diff --git a/deepin-system-monitor-main/common/common.h b/deepin-system-monitor-main/common/common.h
@@ -144,14 +144,14 @@ QString formatHz(quint32 freq, HzUnit base = KHz, int prec = 2);
 
 }   // namespace format
 
-namespace error {
+namespace print {
 
 inline void print_errno(decltype(errno) e, const QString msg)
 {
-    qCWarning(app) << QString("Error: [%1] %2, ").arg(e).arg(strerror(e)) << msg;
+    qCWarning(app) << QString("unsuccess: [%1] %2, ").arg(e).arg(strerror(e)) << msg;
 }
 
-}   // namespace error
+}   // namespace print
 
 namespace time {
 

diff --git a/deepin-system-monitor-main/dbus/dbusalarmnotify.cpp b/deepin-system-monitor-main/dbus/dbusalarmnotify.cpp
@@ -82,8 +82,8 @@ void DBusAlarmNotify::showAlarmNotify(QString topic, QString msg, int timeout)
     QDBusMessage replyMsg = QDBusConnection::sessionBus().call(ddeNotify);
 
     if (replyMsg.type() == QDBusMessage::ErrorMessage) {
-        qCWarning(app) << __FUNCTION__ << __LINE__ << ", dde notify dbus method call fail , error name :"
-                       << replyMsg.errorName() << " , error msg :" << replyMsg.errorMessage();
+        qCWarning(app) << __FUNCTION__ << __LINE__ << ", dde notify dbus method call unsuccess , unsuccess name :"
+                       << replyMsg.errorName() << " , unsuccess msg :" << replyMsg.errorMessage();
         QString cmd = QString("gdbus call -e -d  org.deepin.SystemMonitorDaemon -o /org/deepin/SystemMonitorDaemon -m org.deepin.SystemMonitorDaemon.setAlaramLastTimeInterval 0");
         QProcess::startDetached(cmd);
     } else {

diff --git a/deepin-system-monitor-main/gui/dialog/systemprotectionsetting.cpp b/deepin-system-monitor-main/gui/dialog/systemprotectionsetting.cpp
@@ -486,7 +486,7 @@ void SystemProtectionSetting::onMessgaeSetting(QVariant value)
         QDBusMessage replyMsg = QDBusConnection::sessionBus().call(showDDEControlCenterPage);
 
         if (replyMsg.type() == QDBusMessage::ErrorMessage) {
-            qCWarning(app) << __FUNCTION__ << __LINE__ << ", dde control center dbus method call fail , error name :"
+            qCWarning(app) << __FUNCTION__ << __LINE__ << ", dde control center dbus method call unsuccess , unsuccess name :"
                        << replyMsg.errorName() << " , error msg :" << replyMsg.errorMessage();
         }
 
@@ -514,7 +514,7 @@ void SystemProtectionSetting::onMessgaeSetting(QVariant value)
         QDBusMessage replyMsg = QDBusConnection::sessionBus().call(showDDEControlCenter);
 
         if (replyMsg.type() == QDBusMessage::ErrorMessage) {
-            qCWarning(app) << __FUNCTION__ << __LINE__ << ", dde control center dbus method call fail , error name :"
+            qCWarning(app) << __FUNCTION__ << __LINE__ << ", dde control center dbus method call unsuccess , unsuccess name :"
                        << replyMsg.errorName() << " , error msg :" << replyMsg.errorMessage();
         }
     }

diff --git a/deepin-system-monitor-main/process/process.cpp b/deepin-system-monitor-main/process/process.cpp
@@ -40,7 +40,7 @@
 using namespace common::alloc;
 using namespace common::init;
 using namespace common::core;
-using namespace common::error;
+using namespace common::print;
 using namespace core::system;
 
 namespace core {
@@ -597,6 +597,7 @@ void Process::readIO()
 
     // scan each line
     while (fgets(buf, bsiz, fp.get())) {
+        if (errno != 0) return;
         if (!strncmp(buf, "read_bytes", 10)) {
             sscanf(buf + 12, "%llu", &d->read_bytes);
         } else if (!strncmp(buf, "write_bytes", 11)) {

diff --git a/deepin-system-monitor-main/process/process_set.cpp b/deepin-system-monitor-main/process/process_set.cpp
@@ -15,7 +15,7 @@
 
 #define PROC_PATH "/proc"
 
-using namespace common::error;
+using namespace common::print;
 
 namespace core {
 namespace process {

diff --git a/deepin-system-monitor-main/service/service_manager.cpp b/deepin-system-monitor-main/service/service_manager.cpp
@@ -61,7 +61,7 @@ static bool setServiceEnable(const QString &servieName, bool enable, QString &er
     }
 
     if (!errorString.isEmpty()) {
-        qCWarning(app) << QString("Set service %1 failed, error %1").arg(enable ? "enable" : "disable").arg(errorString);
+        qCWarning(app) << QString("Set service %1 failed, unsuccess %1").arg(enable ? "enable" : "disable").arg(errorString);
         return false;
     } else {
         qCDebug(app) << QString("Set service %1 ret: %2").arg(enable ? "enable" : "disable").arg(retMsg.value());

diff --git a/deepin-system-monitor-main/system/cpu_set.cpp b/deepin-system-monitor-main/system/cpu_set.cpp
@@ -30,7 +30,7 @@ extern "C" {
 #define PROC_PATH_STAT "/proc/stat"
 #define PROC_PATH_CPUINFO "/proc/cpuinfo"
 
-using namespace common::error;
+using namespace common::print;
 using namespace common::alloc;
 using namespace common::init;
 using namespace DDLog;

diff --git a/deepin-system-monitor-main/system/diskio_info.cpp b/deepin-system-monitor-main/system/diskio_info.cpp
@@ -13,7 +13,7 @@
 
 #include <QScopedArrayPointer>
 
-using namespace common::error;
+using namespace common::print;
 using namespace common::alloc;
 
 namespace core {

diff --git a/deepin-system-monitor-main/system/mem.cpp b/deepin-system-monitor-main/system/mem.cpp
@@ -11,7 +11,7 @@
 
 #define PROC_PATH_MEM "/proc/meminfo"
 
-using namespace common::error;
+using namespace common::print;
 using namespace common::alloc;
 
 namespace core {

diff --git a/deepin-system-monitor-main/system/net_info.cpp b/deepin-system-monitor-main/system/net_info.cpp
@@ -9,7 +9,7 @@
 
 #include <QScopedArrayPointer>
 
-using namespace common::error;
+using namespace common::print;
 
 namespace core {
 namespace system {

diff --git a/deepin-system-monitor-main/system/netif_packet_capture.cpp b/deepin-system-monitor-main/system/netif_packet_capture.cpp
@@ -93,7 +93,7 @@ bool NetifPacketCapture::hasDevIP()
     //获取网络IP(IPv4)
     if (ioctl(sockfd, SIOCGIFADDR, &ifr) == -1) {
         close(sockfd);
-        //qCDebug(app)<<"ioctl error!";
+        //qCDebug(app)<<"ioctl unsuccess!";
         return false;
     }
 

diff --git a/deepin-system-monitor-main/system/sys_info.cpp b/deepin-system-monitor-main/system/sys_info.cpp
@@ -36,7 +36,7 @@
 
 using namespace common::alloc;
 using namespace common::core;
-using namespace common::error;
+using namespace common::print;
 using namespace core::system;
 DCORE_USE_NAMESPACE
 

diff --git a/deepin-system-monitor-plugin-popup/process/process.cpp b/deepin-system-monitor-plugin-popup/process/process.cpp
@@ -40,7 +40,7 @@
 using namespace common::alloc;
 using namespace common::init;
 using namespace common::core;
-using namespace common::error;
+using namespace common::print;
 using namespace core::system;
 
 namespace core {

diff --git a/deepin-system-monitor-plugin-popup/system/cpu_set.cpp b/deepin-system-monitor-plugin-popup/system/cpu_set.cpp
@@ -26,7 +26,7 @@
 #define PROC_PATH_STAT "/proc/stat"
 #define PROC_PATH_CPUINFO "/proc/cpuinfo"
 
-using namespace common::error;
+using namespace common::print;
 using namespace common::alloc;
 
 namespace core {

diff --git a/helper.hpp b/helper.hpp
@@ -4,10 +4,13 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once
+#include "ddlog.h"
 
 #include <DSysInfo>
 #include <QDebug>
 
+using namespace DDLog;
+
 namespace common{
 
 class SystemState {
@@ -148,7 +151,7 @@ static inline const SystemState &systemInfo()
     static SystemState *state = nullptr;
     if (!state) {
         const auto version = DTK_CORE_NAMESPACE::DSysInfo::majorVersion();
-        qInfo() << "Running desktop environment version is:" << version << ", versionNumber:" << version.toLong();
+        qCInfo(app) << "Running desktop environment version is:" << version << ", versionNumber:" << version.toLong();
         if (!version.isEmpty() && version.toLong() <= 20) {
             state = new V20SystemState();
             state->updateVersion(true);