From 736fa2dd6dc7579a1de6f93bfac81926d3076c47 Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Wed, 8 Nov 2023 16:28:10 +0100
Subject: [PATCH] fix: supress log in job export #13
---
go.mod | 5 +++--
go.sum | 6 ++++++
job-log.go | 6 +++---
job-stat.go | 7 ++++---
persistence.go | 10 +++++-----
5 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/go.mod b/go.mod
index af25bbc..9c1ee4b 100644
--- a/go.mod
+++ b/go.mod
@@ -6,10 +6,11 @@ require (
github.com/DATA-DOG/go-sqlmock v1.5.0
github.com/docker/docker v24.0.6+incompatible
github.com/docker/go-connections v0.4.0
+ github.com/go-chi/chi/v5 v5.0.10
github.com/google/uuid v1.4.0
github.com/pkg/sftp v1.13.6
github.com/robfig/cron/v3 v3.0.1
- github.com/shirou/gopsutil/v3 v3.23.9
+ github.com/shirou/gopsutil/v3 v3.23.10
github.com/stretchr/testify v1.8.4
go.uber.org/zap v1.26.0
golang.org/x/crypto v0.14.0
@@ -45,7 +46,7 @@ require (
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/net v0.10.0 // indirect
- golang.org/x/sys v0.13.0 // indirect
+ golang.org/x/sys v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.6.0 // indirect
gotest.tools/v3 v3.5.1 // indirect
diff --git a/go.sum b/go.sum
index 6b0427c..91a5103 100644
--- a/go.sum
+++ b/go.sum
@@ -16,6 +16,8 @@ github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKoh
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk=
+github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
@@ -62,6 +64,8 @@ github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
github.com/shirou/gopsutil/v3 v3.23.9 h1:ZI5bWVeu2ep4/DIxB4U9okeYJ7zp/QLTO4auRb/ty/E=
github.com/shirou/gopsutil/v3 v3.23.9/go.mod h1:x/NWSb71eMcjFIO0vhyGW5nZ7oSIgVjrCnADckb85GA=
+github.com/shirou/gopsutil/v3 v3.23.10 h1:/N42opWlYzegYaVkWejXWJpbzKv2JDy3mrgGzKsh9hM=
+github.com/shirou/gopsutil/v3 v3.23.10/go.mod h1:JIE26kpucQi+innVlAUnIEOSBhBUkirr5b44yr55+WE=
github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
@@ -128,6 +132,8 @@ golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
diff --git a/job-log.go b/job-log.go
index 655a52d..e48a2b8 100644
--- a/job-log.go
+++ b/job-log.go
@@ -18,9 +18,9 @@ type JobLog struct {
ErrorMsg string `json:"error_msg"`
IsSuccessful bool `json:"is_successful"`
- CreatedAt time.Time
- UpdatedAt time.Time
- DeletedAt gorm.DeletedAt `gorm:"index"`
+ CreatedAt time.Time `gorm:"column:created_at" json:"created_at" yaml:"created_at"`
+ UpdatedAt time.Time `gorm:"column:updated_at" json:"updated_at" yaml:"updated_at"`
+ DeletedAt gorm.DeletedAt `gorm:"column:deleted_at;index" json:"-" yaml:"-"`
}
type ResourceUsage struct {
diff --git a/job-stat.go b/job-stat.go
index 44c8682..808310a 100644
--- a/job-stat.go
+++ b/job-stat.go
@@ -11,9 +11,10 @@ type JobStats struct {
SuccessCount int `json:"success_count"`
ErrorCount int `json:"error_count"`
TimeMetrics TimeMetrics `json:"time_metrics" gorm:"embedded;embeddedPrefix:time_metrics_"`
- CreatedAt time.Time
- UpdatedAt time.Time
- DeletedAt gorm.DeletedAt `gorm:"index"`
+
+ CreatedAt time.Time `gorm:"column:created_at" json:"created_at" yaml:"created_at"`
+ UpdatedAt time.Time `gorm:"column:updated_at" json:"updated_at" yaml:"updated_at"`
+ DeletedAt gorm.DeletedAt `gorm:"column:deleted_at;index" json:"-" yaml:"-"`
}
type TimeMetrics struct {
diff --git a/persistence.go b/persistence.go
index 6f51566..0454400 100644
--- a/persistence.go
+++ b/persistence.go
@@ -21,12 +21,12 @@ type JobPersistence struct {
Runnable RunnableImport `yaml:"runnable" json:"runnable" gorm:"embedded;embeddedPrefix:runnable_"`
Scheduler SchedulerPersistence `yaml:"scheduler" json:"scheduler,omitempty" gorm:"embedded;embeddedPrefix:scheduler_"`
- Logs []JobLog `gorm:"foreignKey:JobID;references:ID"`
- Stats JobStats `gorm:"foreignKey:JobID"`
+ Logs []JobLog `gorm:"foreignKey:JobID;references:ID" json:"-" yaml:"-"`
+ Stats JobStats `gorm:"foreignKey:JobID" json:"stats" yaml:"stats"`
- CreatedAt time.Time `gorm:"column:created_at"`
- UpdatedAt time.Time `gorm:"column:updated_at"`
- DeletedAt gorm.DeletedAt `gorm:"column:deleted_at;index"`
+ CreatedAt time.Time `gorm:"column:created_at" json:"created_at" yaml:"created_at"`
+ UpdatedAt time.Time `gorm:"column:updated_at" json:"updated_at" yaml:"updated_at"`
+ DeletedAt gorm.DeletedAt `gorm:"column:deleted_at;index" json:"-" yaml:"-"`
}
func (jp JobPersistence) GetLogs() []JobLog {
--
GitLab