Add file logging support (LogFile and LogFileLevel config options).

Ensure that backup-finish is always called, and add a new event,
backup-ok, which is called just before backup-finish when the backup
run was successful.

Keep track of the last backup status notification sent (excluding
backup-start and backup-finish) and send a notification whenever it
changes.

Add a new boolean option, NotifyAlways, to override that check and
always send notifications to the NotifyScript after every backup run,
for notify scripts which do their own state tracking or otherwise
require notification on every event.

1 files changed, 4 insertions, 12 deletions

diff --git a/bin/bbackupd/BackupDaemon.h b/bin/bbackupd/BackupDaemon.h
index f7d61838..0f946164 100644
--- a/bin/bbackupd/BackupDaemon.h
+++ b/bin/bbackupd/BackupDaemon.h
@@ -100,17 +100,7 @@ public:
 	int GetState() {return mState;}
 
 	// Allow other classes to call this too
-	enum
-	{
-		NotifyEvent_StoreFull = 0,
-		NotifyEvent_ReadError,
-		NotifyEvent_BackupError,
-		NotifyEvent_BackupStart,
-		NotifyEvent_BackupFinish,
-		NotifyEvent__MAX
-		// When adding notifications, remember to add strings to NotifySysadmin()
-	};
-	void NotifySysadmin(int Event);
+	void NotifySysadmin(SysadminNotifier::EventCode Event);
 
 private:
 	void Run2();
@@ -119,6 +109,8 @@ public:
 	void InitCrypto();
 	void RunSyncNowWithExceptionHandling();
 	void RunSyncNow();
+	void OnBackupStart();
+	void OnBackupFinish();
 
 private:
 	void DeleteAllLocations();
@@ -213,7 +205,7 @@ private:
 	CommandSocketInfo *mpCommandSocketInfo;
 	
 	// Stop notifications being repeated.
-	bool mNotificationsSent[NotifyEvent__MAX];
+	SysadminNotifier::EventCode mLastNotifiedEvent;
 
 	// Unused entries in the root directory wait a while before being deleted
 	box_time_t mDeleteUnusedRootDirEntriesAfter;	// time to delete them