jpt/edgeboxctl
1
0
Fork 0
mirror of https://github.com/edgebox-iot/edgeboxctl.git synced 2026-09-24 05:41:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed small typo, replaced DB connection details in Makefile by .env loading

Browse Source
This commit is contained in:
Paulo Truta
2021-02-17 12:10:15 +01:00
parent b04e854fdd
commit 59707b8abd
6 changed files with 60 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/tasks/tasks.go
+23 -15
View File
@@ -13,18 +13,6 @@ import (
_ "github.com/go-sql-driver/mysql" // Mysql Driver
)
// Dbhost : Database host (can be tweaked in makefile)
var Dbhost string
// Dbname : Database name (can be tweaked in makefile)
var Dbname string
// Dbuser : Database user (can be tweaked in makefile)
var Dbuser string
// Dbpass : Database password (can be tweaked in)
var Dbpass string
// Task : Struct for Task type
type Task struct {
ID int `json:"id"`
@@ -47,7 +35,7 @@ type taskSetupTunnelArgs struct {
func GetNextTask() Task {
// Will try to connect to API database, which should be running locally under WS.
db, err := sql.Open("mysql", Dbuser+":"+Dbpass+"@tcp("+Dbhost+")/"+Dbname)
db, err := sql.Open("mysql", utils.GetMySQLDbConnectionDetails())
// if there is an error opening the connection, handle it
if err != nil {
@@ -86,7 +74,7 @@ func GetNextTask() Task {
// ExecuteTask : Performs execution of the given task, updating the task status as it goes, and publishing the task result
func ExecuteTask(task Task) Task {
db, err := sql.Open("mysql", Dbuser+":"+Dbpass+"@tcp("+Dbhost+")/"+Dbname)
db, err := sql.Open("mysql", utils.GetMySQLDbConnectionDetails())
if err != nil {
panic(err.Error())
@@ -193,7 +181,27 @@ func taskGetEdgeApps() string {
fmt.Println("Executing taskGetEdgeApps")
log.Println(edgeapps.GetEdgeApps())
edgeApps := edgeapps.GetEdgeApps()
edgeAppsJSON, _ := json.Marshal(edgeApps)
log.Println(string(edgeAppsJSON))
// db, err := sql.Open("mysql", utils.GetMySQLDbConnectionDetails())
// if err != nil {
// panic(err.Error())
// }
// defer db.Close()
// statusUpdate, err := db.Query("UPDATE options SET value = '" + + "' WHERE name = 'EDGEAPPS_LIST'")
// if err != nil {
// panic(err.Error())
// }
// for statusUpdate.Next() {
// }
// Saving information in the "options" table.
return "OK"