Browse Source

fix: lint and request param set

topic
Rennbon 5 years ago
parent
commit
8fd58a2601
  1. 1
      dtmsvr/api.go
  2. 1
      dtmsvr/storage/boltdb/boltdb.go
  3. 1
      dtmsvr/storage/redis/redis.go
  4. 2
      dtmsvr/storage/sql/sql.go
  5. 2
      dtmsvr/storage/trans.go
  6. 3
      dtmsvr/trans_status.go

1
dtmsvr/api.go

@ -71,6 +71,7 @@ func svcForceStop(t *TransGlobal) interface{} {
if err != nil { if err != nil {
return err return err
} }
t.ForceStopReason = ""
dbt.statusFailed(string(extData)) dbt.statusFailed(string(extData))
branches := GetStore().FindBranches(t.Gid) branches := GetStore().FindBranches(t.Gid)
return dbt.Process(branches) return dbt.Process(branches)

1
dtmsvr/storage/boltdb/boltdb.go

@ -364,6 +364,7 @@ func (s *Store) ChangeGlobalStatus(global *storage.TransGlobalStore, newStatus s
dtmimp.E2P(err) dtmimp.E2P(err)
} }
// StatusFailed change global trans status to failed with reason
func (s *Store) StatusFailed(global *storage.TransGlobalStore, updates []string) { func (s *Store) StatusFailed(global *storage.TransGlobalStore, updates []string) {
old := global.Status old := global.Status
global.Status = dtmcli.StatusFailed global.Status = dtmcli.StatusFailed

1
dtmsvr/storage/redis/redis.go

@ -232,6 +232,7 @@ end
dtmimp.E2P(err) dtmimp.E2P(err)
} }
// StatusFailed change global trans status to failed with reason
func (s *Store) StatusFailed(global *storage.TransGlobalStore, updates []string) { func (s *Store) StatusFailed(global *storage.TransGlobalStore, updates []string) {
old := global.Status old := global.Status
global.Status = dtmcli.StatusFailed global.Status = dtmcli.StatusFailed

2
dtmsvr/storage/sql/sql.go

@ -128,7 +128,7 @@ func (s *Store) ChangeGlobalStatus(global *storage.TransGlobalStore, newStatus s
} }
} }
// StatusFailed changes global trans status to failed // StatusFailed change global trans status to failed with reason
func (s *Store) StatusFailed(global *storage.TransGlobalStore, updates []string) { func (s *Store) StatusFailed(global *storage.TransGlobalStore, updates []string) {
old := global.Status old := global.Status
global.Status = dtmcli.StatusFailed global.Status = dtmcli.StatusFailed

2
dtmsvr/storage/trans.go

@ -39,7 +39,7 @@ type TransGlobalStore struct {
NextCronTime *time.Time `json:"next_cron_time,omitempty"` NextCronTime *time.Time `json:"next_cron_time,omitempty"`
Owner string `json:"owner,omitempty"` Owner string `json:"owner,omitempty"`
Ext TransGlobalExt `json:"-" gorm:"-"` Ext TransGlobalExt `json:"-" gorm:"-"`
ForceStopReason string `json:"force_stop_reason" gorm:"-"` ForceStopReason string `json:"force_stop_reason,omitempty" gorm:"-"` // only for request
ExtData string `json:"ext_data,omitempty"` // storage of ext. a db field to store many values. like Options ExtData string `json:"ext_data,omitempty"` // storage of ext. a db field to store many values. like Options
dtmcli.TransOptions dtmcli.TransOptions
} }

3
dtmsvr/trans_status.go

@ -58,13 +58,14 @@ func (t *TransGlobal) changeStatus(status string) {
t.Status = status t.Status = status
} }
// ExtDataType case extData type
type ExtDataType string type ExtDataType string
const ( const (
ExtDataTypeDefault ExtDataType = ""
ExtDataTypeForceStop ExtDataType = "forceStop" ExtDataTypeForceStop ExtDataType = "forceStop"
) )
// ExtData custom extData struct
type ExtData struct { type ExtData struct {
Type ExtDataType `json:"type"` Type ExtDataType `json:"type"`
Msg string `json:"msg"` Msg string `json:"msg"`

Loading…
Cancel
Save