daanselen/chronorunner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring the internal struct

Browse Source
This commit is contained in:
Daan
2025-06-04 23:24:56 +02:00
parent 31200183c1
commit 34ac52f0a1
4 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/modules/database/handlers.go
View File

@@ -141,18 +141,18 @@ func RemoveTask(name, nodeid string) error {
return nil
}
func RetrieveTasks() []utilities.InternalQueueTaskData {
func RetrieveTasks() []utilities.RequestTaskData {
rows, err := db.Query(declStat.ListAllTasks)
if err != nil {
log.Println("Query error:", err)
return []utilities.InternalQueueTaskData{}
return []utilities.RequestTaskData{}
}
defer rows.Close()
var tasks []utilities.InternalQueueTaskData
var tasks []utilities.RequestTaskData
for rows.Next() {
var task utilities.InternalQueueTaskData
var task utilities.RequestTaskData
err := rows.Scan(&task.Name, &task.UUID, &task.Command, &task.Nodeid, &task.Creation, &task.Expire)
if err != nil {

2
server/src/modules/timekeeper/task.go
View File

@@ -32,7 +32,7 @@ func taskRoutine(venvName string, pyListArgs []string) {
wg.Add(1)
go func(task utilities.InternalQueueTaskData) {
go func(task utilities.RequestTaskData) {
defer wg.Done()
log.Println(infoTag, fmt.Sprintf("Node online. NodeID: %s", task.Nodeid), "Executing!")

9
server/src/modules/utilities/structs.go
View File

@@ -35,15 +35,6 @@ type TokenListBody struct {
}
type RequestTaskData struct {
Name string `json:"name"`
Command string `json:"command"`
Nodeids []string `json:"nodeids"`
Creation string `json:"creation"`
Status string `json:"status"`
Expire string `json:"expire"`
}
type InternalQueueTaskData struct {
Name string `json:"name"`
UUID string `json:"uuid"`
Command string `json:"command"`

8
server/src/modules/utilities/utilities.go
View File

@@ -25,24 +25,24 @@ func (t TaskCreateBody) GetName() string { return t.Details.Name }
func CheckOldRemnants(configDir, certDir, databaseDir, fullDatabasePath string) {
remnantConfigDir := StatPath(configDir)
if !remnantConfigDir {
log.Println(InfoTag, "Creating Config (conf) folder...")
log.Println(InfoTag+"[STAT]", "Creating Config (conf) folder...")
os.Mkdir(configDir, os.FileMode(0755))
}
remnantCertDir := StatPath(certDir)
if !remnantCertDir {
log.Println(InfoTag, "Creating Certificate (cert) folder...")
log.Println(InfoTag+"[STAT]", "Creating Certificate (cert) folder...")
os.Mkdir(certDir, os.FileMode(0755))
}
remnantDatabaseDir := StatPath(databaseDir)
if !remnantDatabaseDir {
log.Println(InfoTag, "Creating Database (data) folder...")
log.Println(InfoTag+"[STAT]", "Creating Database (data) folder...")
os.Mkdir(databaseDir, os.FileMode(0755))
}
remnantDatabaseFile := StatPath(fullDatabasePath)
if !remnantDatabaseFile {
log.Println(InfoTag, "Creating Database (ghostserver.db) file...")
log.Println(InfoTag+"[STAT]", "Creating Database (ghostserver.db) file...")
os.Create(fullDatabasePath)
}
}