jpt
/
edgeboxctl
mirror of https://github.com/edgebox-iot/edgeboxctl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support for nullable Task args

pull/8/head
Paulo Truta 2021-05-19 10:43:47 +00:00
parent 58b7425fc7
commit 9f63ab7f03
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/tasks/tasks.go
View File

@ -18,7 +18,7 @@ import (
type Task struct { type Task struct {
ID int `json:"id"` ID int `json:"id"`
Task string `json:"task"` Task string `json:"task"`
Args string `json:"args"` Args sql.NullString `json:"args"` // Database fields that can be null must use the sql.NullString type
Status string `json:"status"` Status string `json:"status"`
Result sql.NullString `json:"result"` // Database fields that can be null must use the sql.NullString type Result sql.NullString `json:"result"` // Database fields that can be null must use the sql.NullString type
Created string `json:"created"` Created string `json:"created"`
@ -121,7 +121,7 @@ func ExecuteTask(task Task) Task {
log.Println("Setting up bootnode connection...") log.Println("Setting up bootnode connection...")
var args taskSetupTunnelArgs var args taskSetupTunnelArgs
err := json.Unmarshal([]byte(task.Args), &args) err := json.Unmarshal([]byte(task.Args.String), &args)
if err != nil { if err != nil {
log.Printf("Error reading arguments of setup_bootnode task: %s", err) log.Printf("Error reading arguments of setup_bootnode task: %s", err)
} else { } else {
@ -133,7 +133,7 @@ func ExecuteTask(task Task) Task {
log.Println("Installing EdgeApp...") log.Println("Installing EdgeApp...")
var args taskInstallEdgeAppArgs var args taskInstallEdgeAppArgs
err := json.Unmarshal([]byte(task.Args), &args) err := json.Unmarshal([]byte(task.Args.String), &args)
if err != nil { if err != nil {
log.Printf("Error reading arguments of install_edgeapp task: %s", err) log.Printf("Error reading arguments of install_edgeapp task: %s", err)
} else { } else {
@ -145,7 +145,7 @@ func ExecuteTask(task Task) Task {
log.Println("Removing EdgeApp...") log.Println("Removing EdgeApp...")
var args taskRemoveEdgeAppArgs var args taskRemoveEdgeAppArgs
err := json.Unmarshal([]byte(task.Args), &args) err := json.Unmarshal([]byte(task.Args.String), &args)
if err != nil { if err != nil {
log.Printf("Error reading arguments of remove_edgeapp task: %s", err) log.Printf("Error reading arguments of remove_edgeapp task: %s", err)
} else { } else {
@ -157,7 +157,7 @@ func ExecuteTask(task Task) Task {
log.Println("Starting EdgeApp...") log.Println("Starting EdgeApp...")
var args taskStartEdgeAppArgs var args taskStartEdgeAppArgs
err := json.Unmarshal([]byte(task.Args), &args) err := json.Unmarshal([]byte(task.Args.String), &args)
if err != nil { if err != nil {
log.Printf("Error reading arguments of start_edgeapp task: %s", err) log.Printf("Error reading arguments of start_edgeapp task: %s", err)
} else { } else {
@ -169,7 +169,7 @@ func ExecuteTask(task Task) Task {
log.Println("Stopping EdgeApp...") log.Println("Stopping EdgeApp...")
var args taskStopEdgeAppArgs var args taskStopEdgeAppArgs
err := json.Unmarshal([]byte(task.Args), &args) err := json.Unmarshal([]byte(task.Args.String), &args)
if err != nil { if err != nil {
log.Printf("Error reading arguments of stop_edgeapp task: %s", err) log.Printf("Error reading arguments of stop_edgeapp task: %s", err)
} else { } else {
@ -181,7 +181,7 @@ func ExecuteTask(task Task) Task {
log.Println("Enabling online access to EdgeApp...") log.Println("Enabling online access to EdgeApp...")
var args taskEnableOnlineArgs var args taskEnableOnlineArgs
err := json.Unmarshal([]byte(task.Args), &args) err := json.Unmarshal([]byte(task.Args.String), &args)
if err != nil { if err != nil {
log.Printf("Error reading arguments of enable_online task: %s", err) log.Printf("Error reading arguments of enable_online task: %s", err)
} else { } else {
@ -193,7 +193,7 @@ func ExecuteTask(task Task) Task {
log.Println("Disabling online access to EdgeApp...") log.Println("Disabling online access to EdgeApp...")
var args taskDisableOnlineArgs var args taskDisableOnlineArgs
err := json.Unmarshal([]byte(task.Args), &args) err := json.Unmarshal([]byte(task.Args.String), &args)
if err != nil { if err != nil {
log.Printf("Error reading arguments of enable_online task: %s", err) log.Printf("Error reading arguments of enable_online task: %s", err)
} else { } else {