Added log messages to the automatic database backup routines (this routine should be double checked for workings)

Author: gizmocuz

main/mainworker.cpp

@@ -1118,108 +1118,111 @@ void MainWorker::HandleAutomaticBackups()
 	int nValue=0;
 	if (!m_sql.GetPreferencesVar("UseAutoBackup",nValue))
 		return;
-	if (nValue==1)
-	{
-		std::stringstream backup_DirH;
-		std::stringstream backup_DirD;
-		std::stringstream backup_DirM;
+	if (nValue != 1)
+		return;
+
+	_log.Log(LOG_STATUS, "Starting automatic database backup procedure...");
+
+	std::stringstream backup_DirH;
+	std::stringstream backup_DirD;
+	std::stringstream backup_DirM;
 
 #ifdef WIN32
-		backup_DirH << szUserDataFolder << "backups\\hourly\\";
-		backup_DirD << szUserDataFolder << "backups\\daily\\";
-		backup_DirM << szUserDataFolder << "backups\\monthly\\";
+	backup_DirH << szUserDataFolder << "backups\\hourly\\";
+	backup_DirD << szUserDataFolder << "backups\\daily\\";
+	backup_DirM << szUserDataFolder << "backups\\monthly\\";
 #else
-		backup_DirH << szUserDataFolder << "backups/hourly/";
-		backup_DirD << szUserDataFolder << "backups/daily/";
-		backup_DirM << szUserDataFolder << "backups/monthly/";
+	backup_DirH << szUserDataFolder << "backups/hourly/";
+	backup_DirD << szUserDataFolder << "backups/daily/";
+	backup_DirM << szUserDataFolder << "backups/monthly/";
 #endif
 
-		std::string sbackup_DirH = backup_DirH.str();
-		std::string sbackup_DirD = backup_DirD.str();
-		std::string sbackup_DirM = backup_DirM.str();
+	std::string sbackup_DirH = backup_DirH.str();
+	std::string sbackup_DirD = backup_DirD.str();
+	std::string sbackup_DirM = backup_DirM.str();
 
-		//create folders if they not exists
-		mkdir_deep(sbackup_DirH.c_str(), 0755);
-		mkdir_deep(sbackup_DirD.c_str(), 0755);
-		mkdir_deep(sbackup_DirM.c_str(), 0755);
+	//create folders if they not exists
+	mkdir_deep(sbackup_DirH.c_str(), 0755);
+	mkdir_deep(sbackup_DirD.c_str(), 0755);
+	mkdir_deep(sbackup_DirM.c_str(), 0755);
 
-		time_t now = mytime(NULL);
-		struct tm tm1;
-		localtime_r(&now,&tm1);
-		int hour = tm1.tm_hour;
-		int day = tm1.tm_mday;
-		int month = tm1.tm_mon;
+	time_t now = mytime(NULL);
+	struct tm tm1;
+	localtime_r(&now,&tm1);
+	int hour = tm1.tm_hour;
+	int day = tm1.tm_mday;
+	int month = tm1.tm_mon;
 
-		int lastHourBackup = -1;
-		int lastDayBackup = -1;
-		int lastMonthBackup = -1;
+	int lastHourBackup = -1;
+	int lastDayBackup = -1;
+	int lastMonthBackup = -1;
 
-		m_sql.GetLastBackupNo("Hour", lastHourBackup);
-		m_sql.GetLastBackupNo("Day", lastDayBackup);
-		m_sql.GetLastBackupNo("Month", lastMonthBackup);
+	m_sql.GetLastBackupNo("Hour", lastHourBackup);
+	m_sql.GetLastBackupNo("Day", lastDayBackup);
+	m_sql.GetLastBackupNo("Month", lastMonthBackup);
 
-		DIR *lDir;
-		//struct dirent *ent;
-		if ((lastHourBackup == -1)||(lastHourBackup !=hour)) {
+	DIR *lDir;
+	//struct dirent *ent;
+	if ((lastHourBackup == -1)||(lastHourBackup !=hour)) {
 
-			if ((lDir = opendir(sbackup_DirH.c_str())) != NULL)
-			{
-				std::stringstream sTmp;
-				sTmp << "backup-hour-" << hour << ".db";
+		if ((lDir = opendir(sbackup_DirH.c_str())) != NULL)
+		{
+			std::stringstream sTmp;
+			sTmp << "backup-hour-" << hour << ".db";
 
-				std::string OutputFileName=sbackup_DirH + sTmp.str();
-				if (m_sql.BackupDatabase(OutputFileName)) {
-					m_sql.SetLastBackupNo("Hour", hour);
-				}
-				else {
-					_log.Log(LOG_ERROR,"Error writing automatic hourly backup file");
-				}
-				closedir(lDir);
+			std::string OutputFileName=sbackup_DirH + sTmp.str();
+			if (m_sql.BackupDatabase(OutputFileName)) {
+				m_sql.SetLastBackupNo("Hour", hour);
 			}
 			else {
-				_log.Log(LOG_ERROR,"Error accessing automatic backup directories");
+				_log.Log(LOG_ERROR,"Error writing automatic hourly backup file");
 			}
+			closedir(lDir);
+		}
+		else {
+			_log.Log(LOG_ERROR,"Error accessing automatic backup directories");
 		}
-		if ((lastDayBackup == -1)||(lastDayBackup !=day)) {
+	}
+	if ((lastDayBackup == -1)||(lastDayBackup !=day)) {
 
-			if ((lDir = opendir(sbackup_DirD.c_str())) != NULL)
-			{
-				std::stringstream sTmp;
-				sTmp << "backup-day-" << day << ".db";
+		if ((lDir = opendir(sbackup_DirD.c_str())) != NULL)
+		{
+			std::stringstream sTmp;
+			sTmp << "backup-day-" << day << ".db";
 
-				std::string OutputFileName=sbackup_DirD + sTmp.str();
-				if (m_sql.BackupDatabase(OutputFileName)) {
-					m_sql.SetLastBackupNo("Day", day);
-				}
-				else {
-					_log.Log(LOG_ERROR,"Error writing automatic daily backup file");
-				}
-				closedir(lDir);
+			std::string OutputFileName=sbackup_DirD + sTmp.str();
+			if (m_sql.BackupDatabase(OutputFileName)) {
+				m_sql.SetLastBackupNo("Day", day);
 			}
 			else {
-				_log.Log(LOG_ERROR,"Error accessing automatic backup directories");
+				_log.Log(LOG_ERROR,"Error writing automatic daily backup file");
 			}
+			closedir(lDir);
 		}
-		if ((lastMonthBackup == -1)||(lastMonthBackup !=month)) {
-			if ((lDir = opendir(sbackup_DirM.c_str())) != NULL)
-			{
-				std::stringstream sTmp;
-				sTmp << "backup-month-" << month+1 << ".db";
+		else {
+			_log.Log(LOG_ERROR,"Error accessing automatic backup directories");
+		}
+	}
+	if ((lastMonthBackup == -1)||(lastMonthBackup !=month)) {
+		if ((lDir = opendir(sbackup_DirM.c_str())) != NULL)
+		{
+			std::stringstream sTmp;
+			sTmp << "backup-month-" << month+1 << ".db";
 
-				std::string OutputFileName=sbackup_DirM + sTmp.str();
-				if (m_sql.BackupDatabase(OutputFileName)) {
-					m_sql.SetLastBackupNo("Month", month);
-				}
-				else {
-					_log.Log(LOG_ERROR,"Error writing automatic monthly backup file");
-				}
-				closedir(lDir);
+			std::string OutputFileName=sbackup_DirM + sTmp.str();
+			if (m_sql.BackupDatabase(OutputFileName)) {
+				m_sql.SetLastBackupNo("Month", month);
 			}
 			else {
-				_log.Log(LOG_ERROR,"Error accessing automatic backup directories");
+				_log.Log(LOG_ERROR,"Error writing automatic monthly backup file");
 			}
+			closedir(lDir);
+		}
+		else {
+			_log.Log(LOG_ERROR,"Error accessing automatic backup directories");
 		}
 	}
+	_log.Log(LOG_STATUS, "Ending automatic database backup procedure...");
 }
 
 void MainWorker::ParseRFXLogFile()