Skip to content

Commit 797c524

Browse files
committed
Modified the audit log file name and Added deletion of empty file
1 parent 5bf943d commit 797c524

File tree

4 files changed

+29
-8
lines changed

4 files changed

+29
-8
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ bin/
1919
pvsadm
2020

2121
# audit logfile
22-
pvsadm.log
22+
pvsadm_audit.log

cmd/root.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func init() {
8080
rootCmd.PersistentFlags().StringVarP(&pkg.Options.APIKey, "api-key", "k", "", "IBMCLOUD API Key(env name: IBMCLOUD_API_KEY)")
8181
rootCmd.PersistentFlags().StringVar(&pkg.Options.Environment, "env", client.DefaultEnv, "IBM Cloud Environments, supported are: ["+strings.Join(client.ListEnvironments(), ", ")+"]")
8282
rootCmd.PersistentFlags().BoolVar(&pkg.Options.Debug, "debug", false, "Enable PowerVS debug option(ATTENTION: dev only option, may print sensitive data from APIs)")
83-
rootCmd.PersistentFlags().StringVar(&pkg.Options.AuditFile, "audit-file", "pvsadm.log", "Audit logs for the tool")
83+
rootCmd.PersistentFlags().StringVar(&pkg.Options.AuditFile, "audit-file", "pvsadm_audit.log", "Audit logs for the tool")
8484
rootCmd.Flags().SortFlags = false
8585
rootCmd.PersistentFlags().SortFlags = false
8686
_ = rootCmd.Flags().MarkHidden("debug")
@@ -96,11 +96,13 @@ func init() {
9696
})
9797

9898
audit.Logger = audit.New(pkg.Options.AuditFile)
99+
99100
}
100101

101-
func Execute() {
102+
func Execute() error {
103+
defer audit.Delete(pkg.Options.AuditFile)
102104
if err := rootCmd.Execute(); err != nil {
103-
klog.Errorln(err)
104-
os.Exit(1)
105+
return err
105106
}
107+
return nil
106108
}

main.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,16 @@
1515
package main
1616

1717
import (
18+
"os"
19+
1820
"github.com/ppc64le-cloud/pvsadm/cmd"
21+
"k8s.io/klog/v2"
1922
)
2023

2124
func main() {
22-
cmd.Execute()
25+
if err := cmd.Execute(); err != nil {
26+
klog.Errorln(err)
27+
os.Exit(1)
28+
}
29+
2330
}

pkg/audit/audit.go

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@ package audit
1616

1717
import (
1818
"encoding/json"
19-
"github.com/ppc64le-cloud/pvsadm/pkg"
20-
"k8s.io/klog/v2"
2119
"os"
2220
"sync"
2321
"time"
22+
23+
"github.com/ppc64le-cloud/pvsadm/pkg"
24+
"k8s.io/klog/v2"
2425
)
2526

2627
var Logger *Audit
@@ -70,3 +71,14 @@ func (a *Audit) Log(name, op, value string) {
7071
}
7172
a.mutex.Unlock()
7273
}
74+
75+
func Delete(file string) {
76+
check_file, err := os.Stat(file)
77+
if err != nil {
78+
klog.V(2).Infoln(err)
79+
return
80+
}
81+
if check_file.Size() == 0 {
82+
os.Remove(file)
83+
}
84+
}

0 commit comments

Comments
 (0)