Move all background workers to engine folder, fix smtp sql queries

basket.go → engine/workers/basket.go

@@ -1,4 +1,4 @@
-package main
+package workers
 
 import (
 	"context"
@@ -9,7 +9,7 @@ import (
 	"github.com/vladimirok5959/golang-worker/worker"
 )
 
-func basket_cleaner(sb *basket.Basket) *worker.Worker {
+func BasketCleaner(sb *basket.Basket) *worker.Worker {
 	return worker.New(func(ctx context.Context, w *worker.Worker, o *[]worker.Iface) {
 		select {
 		case <-ctx.Done():

image.go → engine/workers/image.go

@@ -1,4 +1,4 @@
-package main
+package workers
 
 import (
 	"context"
@@ -18,7 +18,7 @@ import (
 	"github.com/vladimirok5959/golang-worker/worker"
 )
 
-func image_generator(www_dir string) *worker.Worker {
+func ImageGenerator(www_dir string) *worker.Worker {
 	return worker.New(func(ctx context.Context, w *worker.Worker, o *[]worker.Iface) {
 		if www_dir, ok := (*o)[0].(string); ok {
 			image_loop(ctx, www_dir)

session.go → engine/workers/session.go

@@ -1,4 +1,4 @@
-package main
+package workers
 
 import (
 	"context"
@@ -12,7 +12,7 @@ import (
 	"github.com/vladimirok5959/golang-worker/worker"
 )
 
-func session_cleaner(www_dir string) *worker.Worker {
+func SessionCleaner(www_dir string) *worker.Worker {
 	return worker.New(func(ctx context.Context, w *worker.Worker, o *[]worker.Iface) {
 		if www_dir, ok := (*o)[0].(string); ok {
 			session_clean(ctx, www_dir)

smtp.go → engine/workers/smtp.go

@@ -1,4 +1,4 @@
-package main
+package workers
 
 import (
 	"context"
@@ -17,7 +17,7 @@ import (
 	"github.com/vladimirok5959/golang-worker/worker"
 )
 
-func smtp_sender(www_dir string, mp *mysqlpool.MySqlPool) *worker.Worker {
+func SmtpSender(www_dir string, mp *mysqlpool.MySqlPool) *worker.Worker {
 	return worker.New(func(ctx context.Context, w *worker.Worker, o *[]worker.Iface) {
 		if www_dir, ok := (*o)[0].(string); ok {
 			if mp, ok := (*o)[1].(*mysqlpool.MySqlPool); ok {
@@ -79,7 +79,7 @@ func smtp_prepare(ctx context.Context, db *sqlw.DB, conf *config.Config) {
 			subject,
 			message
 		FROM
-			notify_mail
+			fave_notify_mail
 		WHERE
 			status = 2
 		ORDER BY
@@ -98,7 +98,7 @@ func smtp_prepare(ctx context.Context, db *sqlw.DB, conf *config.Config) {
 			if err == nil {
 				if _, err := db.Exec(
 					ctx,
-					`UPDATE notify_mail SET status = 3 WHERE id = ?;`,
+					`UPDATE fave_notify_mail SET status = 3 WHERE id = ?;`,
 					utils.StrToInt(string(values[0])),
 				); err == nil {
 					go func(db *sqlw.DB, conf *config.Config, id int, subject, msg string, receivers []string) {
@@ -114,7 +114,7 @@ func smtp_prepare(ctx context.Context, db *sqlw.DB, conf *config.Config) {
 						); err == nil {
 							if _, err := db.Exec(
 								ctx,
-								`UPDATE notify_mail SET status = 1 WHERE id = ?;`,
+								`UPDATE fave_notify_mail SET status = 1 WHERE id = ?;`,
 								id,
 							); err != nil {
 								fmt.Printf("Smtp send error (sql, success): %v\n", err)
@@ -122,7 +122,7 @@ func smtp_prepare(ctx context.Context, db *sqlw.DB, conf *config.Config) {
 						} else {
 							if _, err := db.Exec(
 								ctx,
-								`UPDATE notify_mail SET error = ?, status = 0 WHERE id = ?;`,
+								`UPDATE fave_notify_mail SET error = ?, status = 0 WHERE id = ?;`,
 								err.Error(),
 								id,
 							); err != nil {

xml.go → engine/workers/xml.go

@@ -1,4 +1,4 @@
-package main
+package workers
 
 import (
 	"context"
@@ -17,7 +17,7 @@ import (
 	"github.com/vladimirok5959/golang-worker/worker"
 )
 
-func xml_generator(www_dir string, mp *mysqlpool.MySqlPool) *worker.Worker {
+func XmlGenerator(www_dir string, mp *mysqlpool.MySqlPool) *worker.Worker {
 	return worker.New(func(ctx context.Context, w *worker.Worker, o *[]worker.Iface) {
 		if www_dir, ok := (*o)[0].(string); ok {
 			if mp, ok := (*o)[1].(*mysqlpool.MySqlPool); ok {

main.go

@@ -20,6 +20,7 @@ import (
 	"golang-fave/engine/modules"
 	"golang-fave/engine/mysqlpool"
 	"golang-fave/engine/utils"
+	"golang-fave/engine/workers"
 	"golang-fave/support"
 
 	"github.com/vladimirok5959/golang-server-bootstrap/bootstrap"
@@ -68,16 +69,16 @@ func main() {
 	mpool := mysqlpool.New()
 
 	// Session cleaner
-	wSessCl := session_cleaner(consts.ParamWwwDir)
+	wSessCl := workers.SessionCleaner(consts.ParamWwwDir)
 
 	// Image processing
-	wImageGen := image_generator(consts.ParamWwwDir)
+	wImageGen := workers.ImageGenerator(consts.ParamWwwDir)
 
 	// Xml generation
-	wXmlGen := xml_generator(consts.ParamWwwDir, mpool)
+	wXmlGen := workers.XmlGenerator(consts.ParamWwwDir, mpool)
 
 	// SMTP sender
-	wSmtpSnd := smtp_sender(consts.ParamWwwDir, mpool)
+	wSmtpSnd := workers.SmtpSender(consts.ParamWwwDir, mpool)
 
 	// Init mounted resources
 	res := resource.New()
@@ -91,7 +92,7 @@ func main() {
 
 	// Shop basket
 	sb := basket.New()
-	wBasketCl := basket_cleaner(sb)
+	wBasketCl := workers.BasketCleaner(sb)
 
 	// Init cache blocks
 	cbs := cblocks.New()