jkaninda/pg-bkup
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Merge pull request #150 from jkaninda/refactor

Browse Source 
chore: add convert backup size from bytes to Mib
This commit is contained in:
Jonas Kaninda
2024-12-10 10:13:30 +01:00
committed by GitHub
parent f9dbd0b85c 01915039e7
commit fdb79d3cef
10 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/azure.go
View File

@@ -63,7 +63,7 @@ func azureBackup(db *dbConfig, config *BackupConfig) {
// Send notification // Send notification
utils.NotifySuccess(&utils.NotificationData{ utils.NotifySuccess(&utils.NotificationData{
File: finalFileName, File: finalFileName,
BackupSize: backupSize, BackupSize: utils.BytesToMb(uint64(backupSize)),
Database: db.dbName, Database: db.dbName,
Storage: config.storage, Storage: config.storage,
BackupLocation: filepath.Join(config.remotePath, finalFileName), BackupLocation: filepath.Join(config.remotePath, finalFileName),

2
pkg/backup.go
View File

@@ -290,7 +290,7 @@ func localBackup(db *dbConfig, config *BackupConfig) {
// Send notification // Send notification
utils.NotifySuccess(&utils.NotificationData{ utils.NotifySuccess(&utils.NotificationData{
File: finalFileName, File: finalFileName,
BackupSize: backupSize, BackupSize: utils.BytesToMb(uint64(backupSize)),
Database: db.dbName, Database: db.dbName,
Storage: config.storage, Storage: config.storage,
BackupLocation: filepath.Join(storagePath, finalFileName), BackupLocation: filepath.Join(storagePath, finalFileName),

4
pkg/remote.go
View File

@@ -92,7 +92,7 @@ func sshBackup(db *dbConfig, config *BackupConfig) {
// Send notification // Send notification
utils.NotifySuccess(&utils.NotificationData{ utils.NotifySuccess(&utils.NotificationData{
File: finalFileName, File: finalFileName,
BackupSize: backupSize, BackupSize: utils.BytesToMb(uint64(backupSize)),
Database: db.dbName, Database: db.dbName,
Storage: config.storage, Storage: config.storage,
BackupLocation: filepath.Join(config.remotePath, finalFileName), BackupLocation: filepath.Join(config.remotePath, finalFileName),
@@ -204,7 +204,7 @@ func ftpBackup(db *dbConfig, config *BackupConfig) {
// Send notification // Send notification
utils.NotifySuccess(&utils.NotificationData{ utils.NotifySuccess(&utils.NotificationData{
File: finalFileName, File: finalFileName,
BackupSize: backupSize, BackupSize: utils.BytesToMb(uint64(backupSize)),
Database: db.dbName, Database: db.dbName,
Storage: config.storage, Storage: config.storage,
BackupLocation: filepath.Join(config.remotePath, finalFileName), BackupLocation: filepath.Join(config.remotePath, finalFileName),

2
pkg/s3.go
View File

@@ -93,7 +93,7 @@ func s3Backup(db *dbConfig, config *BackupConfig) {
// Send notification // Send notification
utils.NotifySuccess(&utils.NotificationData{ utils.NotifySuccess(&utils.NotificationData{
File: finalFileName, File: finalFileName,
BackupSize: backupSize, BackupSize: utils.BytesToMb(uint64(backupSize)),
Database: db.dbName, Database: db.dbName,
Storage: config.storage, Storage: config.storage,
BackupLocation: filepath.Join(config.remotePath, finalFileName), BackupLocation: filepath.Join(config.remotePath, finalFileName),

2
pkg/var.go
View File

@@ -45,14 +45,12 @@ var (
// dbHVars Required environment variables for database // dbHVars Required environment variables for database
var dbHVars = []string{ var dbHVars = []string{
"DB_HOST", "DB_HOST",
"DB_PORT",
"DB_PASSWORD", "DB_PASSWORD",
"DB_USERNAME", "DB_USERNAME",
"DB_NAME", "DB_NAME",
} }
var tdbRVars = []string{ var tdbRVars = []string{
"TARGET_DB_HOST", "TARGET_DB_HOST",
"TARGET_DB_PORT",
"TARGET_DB_NAME", "TARGET_DB_NAME",
"TARGET_DB_USERNAME", "TARGET_DB_USERNAME",
"TARGET_DB_PASSWORD", "TARGET_DB_PASSWORD",

2
templates/email-error.tmpl
View File

@@ -52,9 +52,9 @@
<h3>Failure Details:</h3> <h3>Failure Details:</h3>
<ul> <ul>
<li><strong>Database Name:</strong> {{.DatabaseName}}</li> <li><strong>Database Name:</strong> {{.DatabaseName}}</li>
<li><strong>Error Message:</strong> {{.Error}}</li>
<li><strong>Date:</strong> {{.EndTime}}</li> <li><strong>Date:</strong> {{.EndTime}}</li>
<li><strong>Backup Reference:</strong> {{.BackupReference}}</li> <li><strong>Backup Reference:</strong> {{.BackupReference}}</li>
<li><strong>Error Message:</strong> {{.Error}}</li>
</ul> </ul>
</div> </div>

4
templates/email.tmpl
View File

@@ -45,7 +45,7 @@
</head> </head>
<body> <body>
<h2>✅ Database Backup Successful</h2> <h2>✅ Database Backup Successful</h2>
<p>Dear Team,</p> <p>Hi,</p>
<p>The backup process for the <strong>{{.Database}}</strong> database was successfully completed. Please find the details below:</p> <p>The backup process for the <strong>{{.Database}}</strong> database was successfully completed. Please find the details below:</p>
<div class="details"> <div class="details">
@@ -56,7 +56,7 @@
<li><strong>Backup End Time:</strong> {{.EndTime}}</li> <li><strong>Backup End Time:</strong> {{.EndTime}}</li>
<li><strong>Backup Storage:</strong> {{.Storage}}</li> <li><strong>Backup Storage:</strong> {{.Storage}}</li>
<li><strong>Backup Location:</strong> {{.BackupLocation}}</li> <li><strong>Backup Location:</strong> {{.BackupLocation}}</li>
<li><strong>Backup Size:</strong> {{.BackupSize}} bytes</li> <li><strong>Backup Size:</strong> {{.BackupSize}} MiB</li>
<li><strong>Backup Reference:</strong> {{.BackupReference}}</li> <li><strong>Backup Reference:</strong> {{.BackupReference}}</li>
</ul> </ul>
</div> </div>

4
templates/telegram.tmpl
View File

@@ -1,6 +1,6 @@
✅ Database Backup Successful ✅ Database Backup Successful
Dear Team, Hi,
The backup process for the {{.Database}} database was successfully completed. The backup process for the {{.Database}} database was successfully completed.
Please find the details below: Please find the details below:
@@ -10,7 +10,7 @@ Backup Details:
- Backup EndTime: {{.EndTime}} - Backup EndTime: {{.EndTime}}
- Backup Storage: {{.Storage}} - Backup Storage: {{.Storage}}
- Backup Location: {{.BackupLocation}} - Backup Location: {{.BackupLocation}}
- Backup Size: {{.BackupSize}} bytes - Backup Size: {{.BackupSize}} MiB
- Backup Reference: {{.BackupReference}} - Backup Reference: {{.BackupReference}}
You can access the backup at the specified location if needed. You can access the backup at the specified location if needed.

2
utils/config.go
View File

@@ -37,7 +37,7 @@ type MailConfig struct {
} }
type NotificationData struct { type NotificationData struct {
File string File string
BackupSize int64 BackupSize uint64
Database string Database string
StartTime string StartTime string
EndTime string EndTime string

4
utils/utils.go
View File

@@ -254,3 +254,7 @@ func CronNextTime(cronExpr string) time.Time {
next := schedule.Next(now) next := schedule.Next(now)
return next return next
} }
func BytesToMb(b uint64) uint64 {
return b / 1024 / 1024
}