summaryrefslogtreecommitdiffstats
path: root/src/Daemon
diff options
context:
space:
mode:
Diffstat (limited to 'src/Daemon')
-rw-r--r--src/Daemon/CrashWatcher.cpp7
-rw-r--r--src/Daemon/Daemon.cpp58
-rw-r--r--src/Daemon/MiddleWare.cpp7
-rw-r--r--src/Daemon/MiddleWare.h5
4 files changed, 10 insertions, 67 deletions
diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp
index f8595157..b82823c5 100644
--- a/src/Daemon/CrashWatcher.cpp
+++ b/src/Daemon/CrashWatcher.cpp
@@ -20,6 +20,7 @@
#include "abrtlib.h"
#include "Daemon.h"
#include "ABRTException.h"
+#include "DebugDump.h"
#include "CrashWatcher.h"
void CCrashWatcher::Status(const char *pMessage, const char* peer, uint64_t pJobID)
@@ -75,7 +76,7 @@ vector_crash_infos_t GetCrashInfos(const char *pUID)
error_msg("Can't open file in dump directory for UUID %s, deleting", uuid);
{
std::string debugDumpDir = DeleteCrashInfo(uuid, uid);
- DeleteDebugDumpDir(debugDumpDir.c_str());
+ delete_debug_dump_dir(debugDumpDir.c_str());
}
break;
default:
@@ -132,7 +133,7 @@ map_crash_report_t GetJobResult(const char* pUUID, const char* pUID, int force)
default:
error_msg("Corrupted crash with UUID %s, deleting", pUUID);
std::string debugDumpDir = DeleteCrashInfo(pUUID, pUID);
- DeleteDebugDumpDir(debugDumpDir.c_str());
+ delete_debug_dump_dir(debugDumpDir.c_str());
break;
}
return crashReport;
@@ -211,7 +212,7 @@ bool DeleteDebugDump(const char *pUUID, const char *pUID)
try
{
std::string debugDumpDir = DeleteCrashInfo(pUUID, pUID);
- DeleteDebugDumpDir(debugDumpDir.c_str());
+ delete_debug_dump_dir(debugDumpDir.c_str());
}
catch (CABRTException& e)
{
diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp
index 087d5373..504b4f04 100644
--- a/src/Daemon/Daemon.cpp
+++ b/src/Daemon/Daemon.cpp
@@ -41,6 +41,7 @@
#include "abrtlib.h"
#include "ABRTException.h"
#include "CrashWatcher.h"
+#include "DebugDump.h"
#include "Daemon.h"
@@ -118,53 +119,6 @@ static bool s_exiting;
CCommLayerServer* g_pCommLayer;
-static double GetDirSize(const std::string &pPath, std::string *worst_dir = NULL, const char *excluded = NULL)
-{
- DIR *dp = opendir(pPath.c_str());
- if (dp == NULL)
- return 0;
-
- struct dirent *ep;
- struct stat stats;
- double size = 0;
- double maxsz = 0;
- while ((ep = readdir(dp)) != NULL)
- {
- if (dot_or_dotdot(ep->d_name))
- continue;
- std::string dname = pPath + "/" + ep->d_name;
- if (lstat(dname.c_str(), &stats) != 0)
- continue;
- if (S_ISDIR(stats.st_mode))
- {
- double sz = GetDirSize(dname);
- size += sz;
-
- if (worst_dir && strcmp(excluded, ep->d_name) != 0)
- {
- /* Calculate "weighted" size and age
- * w = sz_kbytes * age_mins */
- sz /= 1024;
- long age = (time(NULL) - stats.st_mtime) / 60;
- if (age > 0)
- sz *= age;
-
- if (sz > maxsz)
- {
- maxsz = sz;
- *worst_dir = ep->d_name;
- }
- }
- }
- else if (S_ISREG(stats.st_mode))
- {
- size += stats.st_size;
- }
- }
- closedir(dp);
- return size;
-}
-
static void cron_delete_callback_data_cb(gpointer data)
{
cron_callback_data_t* cronDeleteCallbackData = static_cast<cron_callback_data_t*>(data);
@@ -385,7 +339,7 @@ static void FindNewDumps(const char* pPath)
case MW_REPORTED:
case MW_OCCURED:
VERB1 log("Already saved crash %s, deleting", itt->c_str());
- DeleteDebugDumpDir(itt->c_str());
+ delete_debug_dump_dir(itt->c_str());
break;
case MW_BLACKLISTED:
case MW_CORRUPTED:
@@ -394,7 +348,7 @@ static void FindNewDumps(const char* pPath)
case MW_FILE_ERROR:
default:
log("Corrupted or bad crash %s (res:%d), deleting", itt->c_str(), (int)res);
- DeleteDebugDumpDir(itt->c_str());
+ delete_debug_dump_dir(itt->c_str());
break;
}
}
@@ -513,12 +467,12 @@ static gboolean handle_inotify_cb(GIOChannel *gio, GIOCondition condition, gpoin
std::string worst_dir;
while (g_settings_nMaxCrashReportsSize > 0
- && GetDirSize(DEBUG_DUMPS_DIR, &worst_dir, name) / (1024*1024) >= g_settings_nMaxCrashReportsSize
+ && get_dirsize_find_largest_dir(DEBUG_DUMPS_DIR, &worst_dir, name) / (1024*1024) >= g_settings_nMaxCrashReportsSize
&& worst_dir != ""
) {
log("Size of '%s' >= %u MB, deleting '%s'", DEBUG_DUMPS_DIR, g_settings_nMaxCrashReportsSize, worst_dir.c_str());
g_pCommLayer->QuotaExceed(_("Report size exceeded the quota. Please check system's MaxCrashReportsSize value in abrt.conf."));
- DeleteDebugDumpDir(concat_path_file(DEBUG_DUMPS_DIR, worst_dir.c_str()).c_str());
+ delete_debug_dump_dir(concat_path_file(DEBUG_DUMPS_DIR, worst_dir.c_str()).c_str());
worst_dir = "";
}
@@ -554,7 +508,7 @@ static gboolean handle_inotify_cb(GIOChannel *gio, GIOCondition condition, gpoin
case MW_FILE_ERROR:
default:
log("Corrupted or bad crash, deleting");
- DeleteDebugDumpDir(fullname.c_str());
+ delete_debug_dump_dir(fullname.c_str());
break;
}
}
diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp
index f3c6bdf4..0a3fb9ad 100644
--- a/src/Daemon/MiddleWare.cpp
+++ b/src/Daemon/MiddleWare.cpp
@@ -520,13 +520,6 @@ report_status_t Report(const map_crash_report_t& pCrashReport,
return ret;
}
-void DeleteDebugDumpDir(const char *pDebugDumpDir)
-{
- CDebugDump dd;
- dd.Open(pDebugDumpDir);
- dd.Delete();
-}
-
std::string DeleteCrashInfo(const char *pUUID,
const char *pUID)
{
diff --git a/src/Daemon/MiddleWare.h b/src/Daemon/MiddleWare.h
index ac042def..b2d3ef28 100644
--- a/src/Daemon/MiddleWare.h
+++ b/src/Daemon/MiddleWare.h
@@ -105,11 +105,6 @@ report_status_t Report(const map_crash_report_t& pCrashReport,
std::string getDebugDumpDir( const char *pUUID,
const char *pUID);
/**
- * Deletes particular debugdump directory.
- * @param pDebugDumpDir A debugdump directory.
- */
-void DeleteDebugDumpDir(const char *pDebugDumpDir);
-/**
* Deletes a row from database. If a deleting is
* successfull, it returns a debugdump directort, which is not
* deleted. Otherwise, it returns empty string.
generated by cgit (git 2.34.1) at 2024-11-11 08:49:40 +0000