Skip to content

Commit d1cae30

Browse files
r4ulclr4ulcl
committed
Remove unused exported functions
1 parent 498dac5 commit d1cae30

3 files changed

Lines changed: 31 additions & 50 deletions

File tree

‎manager/database/DBtask.go‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ func GetTasks(r *http.Request, db *sql.DB, verbose, debug bool) ([]globalstructs
187187
}
188188

189189
// Fetch tasks using the constructed SQL query
190-
return GetTasksSQL(sql, args, db, verbose, debug)
190+
return getTasksSQL(sql, args, db, verbose, debug)
191191
}
192192

193193
func getPage(queryParams url.Values) int {
@@ -211,18 +211,18 @@ func getLimit(queryParams url.Values) int {
211211
// GetTasksPending Get Tasks with status = Pending
212212
func GetTasksPending(limit int, db *sql.DB, verbose, debug bool) ([]globalstructs.Task, error) {
213213
sql := "SELECT ID, notes, commands, files, name, createdAt, updatedAt, executedAt, status, WorkerName, username, priority, timeout, callbackURL, callbackToken FROM task WHERE status = 'pending' ORDER BY priority DESC, createdAt ASC LIMIT ?"
214-
return GetTasksSQL(sql, []interface{}{limit}, db, verbose, debug)
214+
return getTasksSQL(sql, []interface{}{limit}, db, verbose, debug)
215215
}
216216

217-
// GetTasksSQL executes a parameterized SQL query to fetch tasks.
218-
func GetTasksSQL(sqlQuery string, args []interface{}, db *sql.DB, verbose, debug bool) ([]globalstructs.Task, error) {
217+
// getTasksSQL executes a parameterized SQL query to fetch tasks.
218+
func getTasksSQL(sqlQuery string, args []interface{}, db *sql.DB, verbose, debug bool) ([]globalstructs.Task, error) {
219219
var tasks []globalstructs.Task
220220

221221
// Execute the parameterized query
222222
rows, err := db.Query(sqlQuery, args...)
223223
if err != nil {
224224
if debug {
225-
log.Println("DB Error DBTask GetTasksSQL:", sqlQuery, err)
225+
log.Println("DB Error DBTask getTasksSQL:", sqlQuery, err)
226226
}
227227
return tasks, err
228228
}
@@ -242,7 +242,7 @@ func GetTasksSQL(sqlQuery string, args []interface{}, db *sql.DB, verbose, debug
242242
)
243243
if err != nil {
244244
if debug {
245-
log.Println("DB Error DBTask GetTasksSQL: Row Scan", err)
245+
log.Println("DB Error DBTask getTasksSQL: Row Scan", err)
246246
}
247247
return tasks, err
248248
}
@@ -262,7 +262,7 @@ func GetTasksSQL(sqlQuery string, args []interface{}, db *sql.DB, verbose, debug
262262
// Check for errors during row iteration
263263
if err := rows.Err(); err != nil {
264264
if debug {
265-
log.Println("DB Error DBTask GetTasksSQL: Rows Iteration", err)
265+
log.Println("DB Error DBTask getTasksSQL: Rows Iteration", err)
266266
}
267267
return tasks, err
268268
}
@@ -330,15 +330,15 @@ func GetTask(db *sql.DB, id string, verbose, debug bool) (globalstructs.Task, er
330330
return task, nil
331331
}
332332

333-
// GetTaskExecutedAt Get Task ExecutedAt by id
334-
func GetTaskExecutedAt(db *sql.DB, id string, verbose, debug bool) (string, error) {
333+
// getTaskExecutedAt Get Task ExecutedAt by id
334+
func getTaskExecutedAt(db *sql.DB, id string, verbose, debug bool) (string, error) {
335335
// Retrieve the workerName from the task table
336336
var executedAt string
337337
err := db.QueryRow("SELECT executedAt FROM task WHERE ID = ?",
338338
id).Scan(&executedAt)
339339
if err != nil {
340340
if debug {
341-
log.Println("DB Error DBTask GetTaskExecutedAt: ", err)
341+
log.Println("DB Error DBTask getTaskExecutedAt: ", err)
342342
}
343343
return executedAt, err
344344
}
@@ -347,45 +347,45 @@ func GetTaskExecutedAt(db *sql.DB, id string, verbose, debug bool) (string, erro
347347
}
348348

349349
/*
350-
// GetTaskWorker gets task workerName from an ID
350+
// getTaskWorker gets task workerName from an ID
351351
// This is the worker executing the task
352-
func GetTaskWorker(db *sql.DB, id string, verbose, debug bool) (string, error) {
352+
func getTaskWorker(db *sql.DB, id string, verbose, debug bool) (string, error) {
353353
// Retrieve the workerName from the task table
354354
var workerName string
355355
err := db.QueryRow("SELECT WorkerName FROM task WHERE ID = ?",
356356
id).Scan(&workerName)
357357
if err != nil {
358358
if debug {
359-
log.Println("DB Error DBTask GetTaskWorker: ", err)
359+
log.Println("DB Error DBTask getTaskWorker: ", err)
360360
}
361361
return workerName, err
362362
}
363363
364364
return workerName, nil
365365
}
366366
367-
// SetTasksWorkerFailed set to failed all task running worker workerName
368-
func SetTasksWorkerFailed(db *sql.DB, workerName string, verbose, debug bool, wg *sync.WaitGroup) error {
367+
// setTasksWorkerFailed set to failed all task running worker workerName
368+
func setTasksWorkerFailed(db *sql.DB, workerName string, verbose, debug bool, wg *sync.WaitGroup) error {
369369
defer wg.Done()
370370
wg.Add(1)
371371
_, err := db.Exec("UPDATE task SET status = 'failed' WHERE workerName = ? AND status = 'running' ", workerName)
372372
if err != nil {
373373
if debug {
374-
log.Println("DB Error DBTask SetTasksWorkerFailed: ", err)
374+
log.Println("DB Error DBTask setTasksWorkerFailed: ", err)
375375
}
376376
return err
377377
}
378378
return nil
379379
}
380380
381-
// SetTasksWorkerInvalid set to invalid all task running worker workerName
382-
func SetTasksWorkerInvalid(db *sql.DB, workerName string, verbose, debug bool, wg *sync.WaitGroup) error {
381+
// setTasksWorkerInvalid set to invalid all task running worker workerName
382+
func setTasksWorkerInvalid(db *sql.DB, workerName string, verbose, debug bool, wg *sync.WaitGroup) error {
383383
defer wg.Done()
384384
wg.Add(1)
385385
_, err := db.Exec("UPDATE task SET status = 'invalid' WHERE workerName = ? AND status = 'running' ", workerName)
386386
if err != nil {
387387
if debug {
388-
log.Println("DB Error DBTask SetTasksWorkerInvalid: ", err)
388+
log.Println("DB Error DBTask setTasksWorkerInvalid: ", err)
389389
}
390390
return err
391391
}

‎manager/database/DBworkers.go‎

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func RmWorkerName(db *sql.DB, name string, verbose, debug bool, wg *sync.WaitGro
5454
// GetWorkers retrieves all workers from the database.
5555
func GetWorkers(db *sql.DB, verbose, debug bool) ([]globalstructs.Worker, error) {
5656
sql := "SELECT name, defaultThreads, iddleThreads, up, downCount FROM worker;"
57-
return GetWorkerSQL(sql, db, verbose, debug)
57+
return getWorkerSQL(sql, db, verbose, debug)
5858
}
5959

6060
// GetWorker retrieves a worker from the database by its name.
@@ -145,17 +145,17 @@ func SetIddleThreadsTo(IddleThreads int, db *sql.DB, worker string, verbose, deb
145145
// GetWorkerIddle retrieves all workers that are iddle.
146146
func GetWorkerIddle(db *sql.DB, verbose, debug bool) ([]globalstructs.Worker, error) {
147147
sql := "SELECT name, defaultThreads, iddleThreads, up, downCount FROM worker WHERE up = true AND IddleThreads > 0 ORDER BY RAND();"
148-
return GetWorkerSQL(sql, db, verbose, debug)
148+
return getWorkerSQL(sql, db, verbose, debug)
149149
}
150150

151-
// GetWorkerUP retrieves all workers that are up.
152-
func GetWorkerUP(db *sql.DB, verbose, debug bool) ([]globalstructs.Worker, error) {
151+
// getWorkerUP retrieves all workers that are up.
152+
func getWorkerUP(db *sql.DB, verbose, debug bool) ([]globalstructs.Worker, error) {
153153
sql := "SELECT name, defaultThreads, iddleThreads, up, downCount FROM worker WHERE up = true;"
154-
return GetWorkerSQL(sql, db, verbose, debug)
154+
return getWorkerSQL(sql, db, verbose, debug)
155155
}
156156

157-
// GetWorkerSQL retrieves workers information based on a SQL statement.
158-
func GetWorkerSQL(sql string, db *sql.DB, verbose, debug bool) ([]globalstructs.Worker, error) {
157+
// getWorkerSQL retrieves workers information based on a SQL statement.
158+
func getWorkerSQL(sql string, db *sql.DB, verbose, debug bool) ([]globalstructs.Worker, error) {
159159
// Slice to store all workers
160160
var workers []globalstructs.Worker
161161

@@ -294,25 +294,6 @@ func GetDownCount(db *sql.DB, verbose, debug bool) (int, error) {
294294
return count, nil
295295
}
296296

297-
/*
298-
// AddWorkerIddleThreads1 sets the status of a worker to the specified working value using the worker's name.
299-
func AddWorkerIddleThreads2222(db *sql.DB, worker string, verbose, debug bool, wg *sync.WaitGroup) error {
300-
defer wg.Done()
301-
wg.Add(1)
302-
if debug {
303-
log.Println("DB AddWorkerIddleThreads1 worker name:", worker)
304-
}
305-
_, err := db.Exec("UPDATE worker SET IddleThreads = IddleThreads + 1 WHERE name = ?;",
306-
worker)
307-
if err != nil {
308-
if debug {
309-
log.Println("DB Error DBworkers: ", err)
310-
}
311-
return err
312-
}
313-
return nil
314-
}*/
315-
316297
// SubtractWorkerIddleThreads1 Subtract WorkerIddleThreads 1 if >0
317298
func SubtractWorkerIddleThreads1(db *sql.DB, worker string, verbose, debug bool, wg *sync.WaitGroup) error {
318299
defer wg.Done()

‎worker/managerrequest/managerRequest.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ func SendMessage(conn *websocket.Conn, message []byte, verbose, debug bool, writ
7272
return nil
7373
}
7474

75-
// SendWebSocketMessage is a helper function to send a WebSocket message to the manager
76-
func SendWebSocketMessage(config *utils.WorkerConfig, messageType string, payload interface{}, verbose, debug bool, writeLock *sync.Mutex) error {
75+
// sendWebSocketMessage is a helper function to send a WebSocket message to the manager
76+
func sendWebSocketMessage(config *utils.WorkerConfig, messageType string, payload interface{}, verbose, debug bool, writeLock *sync.Mutex) error {
7777
// Marshal the payload into JSON
7878
payloadData, err := json.Marshal(payload)
7979
if err != nil {
@@ -113,7 +113,7 @@ func AddWorker(config *utils.WorkerConfig, verbose, debug bool, writeLock *sync.
113113
DownCount: 0,
114114
}
115115

116-
return SendWebSocketMessage(config, "addWorker", worker, verbose, debug, writeLock)
116+
return sendWebSocketMessage(config, "addWorker", worker, verbose, debug, writeLock)
117117
}
118118

119119
// DeleteWorker sends a POST request to delete a worker from the manager
@@ -125,10 +125,10 @@ func DeleteWorker(config *utils.WorkerConfig, verbose, debug bool, writeLock *sy
125125
DownCount: 0,
126126
}
127127

128-
return SendWebSocketMessage(config, "deleteWorker", worker, verbose, debug, writeLock)
128+
return sendWebSocketMessage(config, "deleteWorker", worker, verbose, debug, writeLock)
129129
}
130130

131131
// CallbackTaskMessage sends a POST request to the manager with a task message
132132
func CallbackTaskMessage(config *utils.WorkerConfig, task *globalstructs.Task, verbose, debug bool, writeLock *sync.Mutex) error {
133-
return SendWebSocketMessage(config, "callbackTask", task, verbose, debug, writeLock)
133+
return sendWebSocketMessage(config, "callbackTask", task, verbose, debug, writeLock)
134134
}

0 commit comments

Comments
 (0)