Skip to content

Commit e5ba184

Browse files
PlaenklerPlaenkler
authored
Merge pull request #420 from Plaenkler/add-logs-to-frontend
[ADD] Logs to frontend
2 parents a5ab211 + 5010a39 commit e5ba184

File tree

19 files changed

+206
-114
lines changed

19 files changed

+206
-114
lines changed

‎.github/workflows/linters.yml

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ jobs:
3030
VALIDATE_ALL_CODEBASE: true
3131
VALIDATE_HTML: false
3232
VALIDATE_JAVASCRIPT_STANDARD: false
33+
VALIDATE_JAVASCRIPT_PRETTIER: false
34+
VALIDATE_JSCPD: false
3335
VALIDATE_GO: false
3436
VALIDATE_GO_MODULES: false
3537
golangci-lint:

‎cmd/def/main.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@ import (
1313

1414
func main() {
1515
database.Start()
16-
log.Infof("[main-main-1] started database connection")
16+
log.Infof("started database connection")
1717
go ddns.Start()
18-
log.Infof("[main-main-2] started ddns service")
18+
log.Infof("started ddns service")
1919
go session.Start()
20-
log.Infof("[main-main-3] started session service")
20+
log.Infof("started session service")
2121
go server.Start()
22-
log.Infof("[main-main-4] started webserver")
22+
log.Infof("started webserver")
2323
c := make(chan os.Signal, 1)
2424
signal.Notify(c, os.Interrupt)
2525
<-c
2626
server.Stop()
27-
log.Infof("[main-main-5] stopped webserver")
27+
log.Infof("stopped webserver")
2828
session.Stop()
29-
log.Infof("[main-main-6] stopped session service")
29+
log.Infof("stopped session service")
3030
ddns.Stop()
31-
log.Infof("[main-main-7] stopped ddns service")
31+
log.Infof("stopped ddns service")
3232
database.Stop()
33-
log.Infof("[main-main-8] stopped database connection")
33+
log.Infof("stopped database connection")
3434
}

‎cmd/svc/main.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,25 @@ type program struct{}
1616

1717
func (p *program) Start(_ service.Service) error {
1818
database.Start()
19-
log.Infof("[main-Start-1] started database connection")
19+
log.Infof("started database connection")
2020
go ddns.Start()
21-
log.Infof("[main-Start-2] started ddns service")
21+
log.Infof("started ddns service")
2222
go session.Start()
23-
log.Infof("[main-Start-3] started session service")
23+
log.Infof("started session service")
2424
go server.Start()
25-
log.Infof("[main-Start-4] started webserver")
25+
log.Infof("started webserver")
2626
return nil
2727
}
2828

2929
func (p *program) Stop(_ service.Service) error {
3030
server.Stop()
31-
log.Infof("[main-Stop-1] stopped webserver")
31+
log.Infof("stopped webserver")
3232
session.Stop()
33-
log.Infof("[main-Stop-2] stopped session service")
33+
log.Infof("stopped session service")
3434
ddns.Stop()
35-
log.Infof("[main-Stop-3] stopped ddns service")
35+
log.Infof("stopped ddns service")
3636
database.Stop()
37-
log.Infof("[main-Stop-4] stopped database connection")
37+
log.Infof("stopped database connection")
3838
return nil
3939
}
4040

@@ -43,14 +43,14 @@ func main() {
4343
p := &program{}
4444
err := p.Start(nil)
4545
if err != nil {
46-
log.Fatalf("[main-main-0] failed to start service: %v", err)
46+
log.Fatalf("failed to start service: %v", err)
4747
}
4848
c := make(chan os.Signal, 1)
4949
signal.Notify(c, os.Interrupt)
5050
<-c
5151
err = p.Stop(nil)
5252
if err != nil {
53-
log.Fatalf("[main-main-0] failed to stop service: %v", err)
53+
log.Fatalf("failed to stop service: %v", err)
5454
}
5555
return
5656
}
@@ -62,10 +62,10 @@ func main() {
6262
prg := &program{}
6363
s, err := service.New(prg, svcConfig)
6464
if err != nil {
65-
log.Fatalf("[main-main-1] failed to create service: %v", err)
65+
log.Fatalf("failed to create service: %v", err)
6666
}
6767
err = s.Run()
6868
if err != nil {
69-
log.Errorf("[main-main-2] failed to run service: %v", err)
69+
log.Errorf("failed to run service: %v", err)
7070
}
7171
}

‎pkg/cipher/cipher.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func init() {
2727
var err error
2828
key, err = read()
2929
if err != nil {
30-
log.Fatalf("[cipher-init-1] could not load key: %v", err)
30+
log.Fatalf("could not load key: %v", err)
3131
}
3232
}
3333

@@ -80,41 +80,41 @@ func generate() ([]byte, error) {
8080
func Encrypt(plaintext string) (string, error) {
8181
encrypter, err := aes.NewCipher(key)
8282
if err != nil {
83-
return "", fmt.Errorf("[cipher-Encrypt-1] encryption failed: %s", err)
83+
return "", fmt.Errorf("encryption failed: %s", err)
8484
}
8585
gcm, err := cipher.NewGCM(encrypter)
8686
if err != nil {
87-
return "", fmt.Errorf("[cipher-Encrypt-2] encryption failed: %s", err)
87+
return "", fmt.Errorf("encryption failed: %s", err)
8888
}
8989
nonce := make([]byte, gcm.NonceSize())
9090
_, err = io.ReadFull(rand.Reader, nonce)
9191
if err != nil {
92-
return "", fmt.Errorf("[cipher-Encrypt-3] encryption failed: %s", err)
92+
return "", fmt.Errorf("encryption failed: %s", err)
9393
}
9494
return base64.StdEncoding.EncodeToString(gcm.Seal(nonce, nonce, []byte(plaintext), nil)), nil
9595
}
9696

9797
func Decrypt(ciphertext string) ([]byte, error) {
9898
c, err := aes.NewCipher(key)
9999
if err != nil {
100-
return nil, fmt.Errorf("[cipher-Decrypt-1] decryption failed: %s", err)
100+
return nil, fmt.Errorf("decryption failed: %s", err)
101101
}
102102
gcm, err := cipher.NewGCM(c)
103103
if err != nil {
104-
return nil, fmt.Errorf("[cipher-Decrypt-2] decryption failed: %s", err)
104+
return nil, fmt.Errorf("decryption failed: %s", err)
105105
}
106106
cipherBytes, err := base64.StdEncoding.DecodeString(ciphertext)
107107
if err != nil {
108-
return nil, fmt.Errorf("[cipher-Decrypt-3] decryption failed: %s", err)
108+
return nil, fmt.Errorf("decryption failed: %s", err)
109109
}
110110
nonceSize := gcm.NonceSize()
111111
if len(cipherBytes) < nonceSize {
112-
return nil, fmt.Errorf("[cipher-Decrypt-4] decryption failed: %s", err)
112+
return nil, fmt.Errorf("decryption failed: %s", err)
113113
}
114114
nonce, cipherBytes := cipherBytes[:nonceSize], cipherBytes[nonceSize:]
115115
plaintext, err := gcm.Open(nil, nonce, cipherBytes, nil)
116116
if err != nil {
117-
return nil, fmt.Errorf("[cipher-Decrypt-5] decryption failed: %s", err)
117+
return nil, fmt.Errorf("decryption failed: %s", err)
118118
}
119119
return plaintext, nil
120120
}

‎pkg/config/config.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ var (
3434
func init() {
3535
err := load()
3636
if err != nil {
37-
log.Fatalf("[config-init-1] initialization failed: %s", err.Error())
37+
log.Fatalf("initialization failed: %s", err.Error())
3838
}
3939
}
4040

@@ -83,7 +83,7 @@ func create() error {
8383
if err != nil {
8484
return err
8585
}
86-
log.Infof("[config-create-1] created default configuration")
86+
log.Infof("created default configuration")
8787
return nil
8888
}
8989

‎pkg/database/service.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ func Start() {
2424
oc.Do(func() {
2525
err := createDBDir()
2626
if err != nil {
27-
log.Fatalf("[database-Start-1] failed to create database directory: %s", err.Error())
27+
log.Fatalf("failed to create database directory: %s", err.Error())
2828
}
2929
db, err = openDBConnection()
3030
if err != nil {
31-
log.Fatalf("[database-Start-2] failed to open database connection: %s", err.Error())
31+
log.Fatalf("failed to open database connection: %s", err.Error())
3232
}
3333
err = migrateDBSchema(db)
3434
if err != nil {
35-
log.Fatalf("[database-Start-3] failed to migrate database schema: %s", err.Error())
35+
log.Fatalf("failed to migrate database schema: %s", err.Error())
3636
}
3737
})
3838
}
@@ -70,12 +70,12 @@ func Stop() {
7070
}
7171
sqlDB, err := db.DB()
7272
if err != nil {
73-
log.Errorf("[database-Stop-1] failed to get underlying DB connection: %s", err.Error())
73+
log.Errorf("failed to get underlying DB connection: %s", err.Error())
7474
return
7575
}
7676
err = sqlDB.Close()
7777
if err != nil {
78-
log.Errorf("[database-Stop-2] failed to close DB connection: %s", err.Error())
78+
log.Errorf("failed to close DB connection: %s", err.Error())
7979
}
8080
}
8181

‎pkg/ddns/resolver.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,21 @@ func GetPublicIP() (string, error) {
2626
if cRes != "" {
2727
addr, err := resolveIPAddress(cRes)
2828
if err != nil {
29-
return "", fmt.Errorf("[ddns-GetPublicIP-1] resolver %s failed: %s", cRes, err)
29+
return "", fmt.Errorf("resolver %s failed: %s", cRes, err)
3030
}
31-
log.Infof("[ddns-GetPublicIP-2] %s succeeded: %s", cRes, addr)
31+
log.Infof("%s succeeded: %s", cRes, addr)
3232
return addr, nil
3333
}
3434
for r := range resolvers {
3535
addr, err := resolveIPAddress(resolvers[r])
3636
if err != nil {
37-
log.Errorf("[ddns-GetPublicIP-3] resolver %s failed: %s", r, err)
37+
log.Errorf("resolver %s failed: %s", r, err)
3838
continue
3939
}
40-
log.Infof("[ddns-GetPublicIP-4] %s succeeded: %s", r, addr)
40+
log.Infof("%s succeeded: %s", r, addr)
4141
return addr, nil
4242
}
43-
return "", fmt.Errorf("[ddns-GetPublicIP-5] all resolvers failed")
43+
return "", fmt.Errorf("all resolvers failed")
4444
}
4545

4646
func resolveIPAddress(url string) (string, error) {

‎pkg/ddns/service.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -31,25 +31,25 @@ func Start() {
3131
updateInterval(interval, ticker)
3232
address, err := GetPublicIP()
3333
if err != nil {
34-
log.Errorf("[ddns-Start-1] failed to get public IP address: %v", err)
34+
log.Errorf("failed to get public IP address: %v", err)
3535
continue
3636
}
3737
newAddress := model.IPAddress{
3838
Address: address,
3939
}
4040
db := database.GetDatabase()
4141
if db == nil {
42-
log.Errorf("[ddns-Start-2] failed to get database connection")
42+
log.Errorf("failed to get database connection")
4343
continue
4444
}
4545
err = db.FirstOrCreate(&newAddress, newAddress).Error
4646
if err != nil {
47-
log.Errorf("[ddns-Start-3] failed to save new IP address: %v", err)
47+
log.Errorf("failed to save new IP address: %v", err)
4848
continue
4949
}
5050
jobs := getSyncJobs(db, newAddress.ID)
5151
if len(jobs) == 0 {
52-
log.Infof("[ddns-Start-4] no dynamic DNS record needs to be updated")
52+
log.Infof("no dynamic DNS record needs to be updated")
5353
continue
5454
}
5555
updateDDNSEntries(db, jobs, newAddress)
@@ -63,15 +63,15 @@ func updateInterval(interval time.Duration, ticker *time.Ticker) {
6363
newInterval := time.Second * time.Duration(config.Get().Interval)
6464
if interval != newInterval && newInterval > 0 {
6565
ticker.Reset(newInterval)
66-
log.Infof("[ddns-updateInterval-1] changed interval from %v to %v", interval, newInterval)
66+
log.Infof("changed interval from %v to %v", interval, newInterval)
6767
}
6868
}
6969

7070
func getSyncJobs(db *gorm.DB, addressID uint) []model.SyncJob {
7171
var jobs []model.SyncJob
7272
err := db.Where("NOT ip_address_id = ? OR ip_address_id IS NULL", addressID).Find(&jobs).Error
7373
if err != nil {
74-
log.Errorf("[ddns-getSyncJobs-1] failed to get DDNS update jobs: %v", err)
74+
log.Errorf("failed to get DDNS update jobs: %v", err)
7575
return nil
7676
}
7777
return jobs
@@ -81,30 +81,30 @@ func updateDDNSEntries(db *gorm.DB, jobs []model.SyncJob, a model.IPAddress) {
8181
for _, job := range jobs {
8282
updater, ok := updaters[job.Provider]
8383
if !ok {
84-
log.Errorf("[ddns-updateDDNSEntries-1] no updater found for job %v", job.ID)
84+
log.Errorf("no updater found for job %v", job.ID)
8585
continue
8686
}
8787
params, err := cipher.Decrypt(job.Params)
8888
if err != nil {
89-
log.Errorf("[ddns-updateDDNSEntries-2] failed to decrypt job params for job %v: %s", job.ID, err)
89+
log.Errorf("failed to decrypt job params for job %v: %s", job.ID, err)
9090
continue
9191
}
9292
request := reflect.New(reflect.TypeOf(updater.Request)).Interface()
9393
err = json.Unmarshal(params, &request)
9494
if err != nil {
95-
log.Errorf("[ddns-updateDDNSEntries-3] failed to unmarshal job params for job %v: %s", job.ID, err)
95+
log.Errorf("failed to unmarshal job params for job %v: %s", job.ID, err)
9696
continue
9797
}
9898
err = updater.Updater(request, a.Address)
9999
if err != nil {
100-
log.Errorf("[ddns-updateDDNSEntries-4] failed to update DDNS entry for job %v: %s", job.ID, err)
100+
log.Errorf("failed to update DDNS entry for job %v: %s", job.ID, err)
101101
continue
102102
}
103103
err = db.Model(&job).Update("ip_address_id", a.ID).Error
104104
if err != nil {
105-
log.Errorf("[ddns-updateDDNSEntries-5] failed to update IP address for job %v: %s", job.ID, err)
105+
log.Errorf("failed to update IP address for job %v: %s", job.ID, err)
106106
}
107-
log.Infof("[ddns-updateDDNSEntries-6] updated DDNS entry for ID: %v", job.ID)
107+
log.Infof("updated DDNS entry for ID: %v", job.ID)
108108
}
109109
}
110110

0 commit comments

Comments
 (0)