Move products XML generation to background

engine/wrapper/wrapper.go

@@ -274,6 +274,13 @@ func (this *Wrapper) ConfigSave() error {
 	return this.Config.ConfigWrite(this.DConfig + string(os.PathSeparator) + "config.json")
 }
 
+func (this *Wrapper) RecreateProductXmlFile() error {
+	if _, err := os.Create(this.DTmp + string(os.PathSeparator) + "trigger.xml.run"); err != nil {
+		return err
+	}
+	return nil
+}
+
 func (this *Wrapper) RemoveProductImageThumbnails(product_id, filename string) error {
 	pattern := this.DHtdocs + string(os.PathSeparator) + strings.Join([]string{"products", "images", product_id, filename}, string(os.PathSeparator))
 	if files, err := filepath.Glob(pattern); err != nil {
@@ -287,7 +294,3 @@ func (this *Wrapper) RemoveProductImageThumbnails(product_id, filename string) e
 	}
 	return nil
 }
-
-func (this *Wrapper) RemoveProductXmlCacheFile() error {
-	return os.Remove(this.DHtdocs + string(os.PathSeparator) + "products.xml")
-}

image.go

@@ -152,7 +152,7 @@ func image_stop(ch, stop chan bool) {
 			<-ch
 			return
 		case <-time.After(3 * time.Second):
-			fmt.Println("Image error: force exit by timeout after 8 seconds")
+			fmt.Println("Image error: force exit by timeout after 3 seconds")
 			return
 		}
 	}

main.go

@@ -102,6 +102,10 @@ func main() {
 	// MySQL connections pool
 	mpool := mysqlpool.New()
 
+	// Xml generation
+	xml_cl_ch, xml_cl_stop := xml_start(consts.ParamWwwDir, mpool)
+	defer xml_stop(xml_cl_ch, xml_cl_stop)
+
 	// Init cache blocks
 	cbs := cblocks.New()
 

modules/module_api.go

@@ -28,36 +28,19 @@ func (this *Modules) RegisterModule_Api() *Module {
 					return
 				}
 
+				// Response
 				target_file := wrap.DHtdocs + string(os.PathSeparator) + "products.xml"
 				if !utils.IsFileExists(target_file) {
-					data := []byte(this.api_GenerateEmptyXml(wrap))
-
-					// Make empty file
-					if file, err := os.Create(target_file); err == nil {
-						file.Write(data)
-						file.Close()
-					}
-
-					// Make regular XML
-					data = []byte(this.api_GenerateXml(wrap))
-
-					// Save file
-					wrap.RemoveProductXmlCacheFile()
-					if file, err := os.Create(target_file); err == nil {
-						file.Write(data)
-						file.Close()
-					}
-
 					wrap.W.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
 					wrap.W.Header().Set("Content-Type", "text/xml; charset=utf-8")
-					wrap.W.WriteHeader(http.StatusOK)
-					wrap.W.Write(data)
+					wrap.W.WriteHeader(http.StatusServiceUnavailable)
+					wrap.W.Write([]byte("In progress..."))
 				} else {
 					http.ServeFile(wrap.W, wrap.R, target_file)
 				}
 			} else {
 				wrap.W.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
-				wrap.W.WriteHeader(http.StatusNotFound)
+				wrap.W.WriteHeader(http.StatusServiceUnavailable)
 				wrap.W.Write([]byte("Disabled!"))
 			}
 		} else if len(wrap.UrlArgs) == 1 {

modules/module_settings_act_api.go

@@ -30,6 +30,8 @@ func (this *Modules) RegisterAction_SettingsApi() *Action {
 			return
 		}
 
+		wrap.RecreateProductXmlFile()
+
 		wrap.ResetCacheBlocks()
 
 		// Reload current page

modules/module_shop_act_delete.go

@@ -55,8 +55,7 @@ func (this *Modules) RegisterAction_ShopDelete() *Action {
 			return
 		}
 
-		// Delete products XML cache
-		wrap.RemoveProductXmlCacheFile()
+		wrap.RecreateProductXmlFile()
 
 		wrap.ResetCacheBlocks()
 

modules/module_shop_act_modify.go

@@ -184,8 +184,7 @@ func (this *Modules) RegisterAction_ShopModify() *Action {
 				return
 			}
 
-			// Delete products XML cache
-			wrap.RemoveProductXmlCacheFile()
+			wrap.RecreateProductXmlFile()
 
 			wrap.ResetCacheBlocks()
 
@@ -301,8 +300,7 @@ func (this *Modules) RegisterAction_ShopModify() *Action {
 				return
 			}
 
-			// Delete products XML cache
-			wrap.RemoveProductXmlCacheFile()
+			wrap.RecreateProductXmlFile()
 
 			wrap.ResetCacheBlocks()
 

modules/module_shop_act_upload_delete.go

@@ -57,8 +57,7 @@ func (this *Modules) RegisterAction_ShopUploadDelete() *Action {
 			return
 		}
 
-		// Delete products XML cache
-		wrap.RemoveProductXmlCacheFile()
+		wrap.RecreateProductXmlFile()
 
 		wrap.ResetCacheBlocks()
 

modules/module_shop_act_upload_image.go

@@ -84,8 +84,7 @@ func (this *Modules) RegisterAction_ShopUploadImage() *Action {
 			}
 		}
 
-		// Delete products XML cache
-		wrap.RemoveProductXmlCacheFile()
+		wrap.RecreateProductXmlFile()
 
 		wrap.ResetCacheBlocks()
 	})

modules/module_shop_attributes_act_delete.go

@@ -76,8 +76,7 @@ func (this *Modules) RegisterAction_ShopAttributesDelete() *Action {
 			return
 		}
 
-		// Delete products XML cache
-		wrap.RemoveProductXmlCacheFile()
+		wrap.RecreateProductXmlFile()
 
 		wrap.ResetCacheBlocks()
 

modules/module_shop_attributes_act_modify.go

@@ -90,8 +90,7 @@ func (this *Modules) RegisterAction_ShopAttributesModify() *Action {
 				return
 			}
 
-			// Delete products XML cache
-			wrap.RemoveProductXmlCacheFile()
+			wrap.RecreateProductXmlFile()
 
 			wrap.ResetCacheBlocks()
 
@@ -222,8 +221,7 @@ func (this *Modules) RegisterAction_ShopAttributesModify() *Action {
 				return
 			}
 
-			// Delete products XML cache
-			wrap.RemoveProductXmlCacheFile()
+			wrap.RecreateProductXmlFile()
 
 			wrap.ResetCacheBlocks()
 

modules/module_shop_categories_act_delete.go

@@ -62,8 +62,7 @@ func (this *Modules) RegisterAction_ShopCategoriesDelete() *Action {
 			return
 		}
 
-		// Delete products XML cache
-		wrap.RemoveProductXmlCacheFile()
+		wrap.RecreateProductXmlFile()
 
 		wrap.ResetCacheBlocks()
 

modules/module_shop_categories_act_modify.go

@@ -224,8 +224,7 @@ func (this *Modules) RegisterAction_ShopCategoriesModify() *Action {
 				return
 			}
 
-			// Delete products XML cache
-			wrap.RemoveProductXmlCacheFile()
+			wrap.RecreateProductXmlFile()
 
 			wrap.ResetCacheBlocks()
 
@@ -236,8 +235,7 @@ func (this *Modules) RegisterAction_ShopCategoriesModify() *Action {
 				return
 			}
 
-			// Delete products XML cache
-			wrap.RemoveProductXmlCacheFile()
+			wrap.RecreateProductXmlFile()
 
 			wrap.ResetCacheBlocks()
 

modules/module_shop_currencies_act_delete.go

@@ -34,8 +34,7 @@ func (this *Modules) RegisterAction_ShopCurrenciesDelete() *Action {
 			return
 		}
 
-		// Delete products XML cache
-		wrap.RemoveProductXmlCacheFile()
+		wrap.RecreateProductXmlFile()
 
 		wrap.ResetCacheBlocks()
 

modules/module_shop_currencies_act_modify.go

@@ -74,8 +74,7 @@ func (this *Modules) RegisterAction_ShopCurrenciesModify() *Action {
 				return
 			}
 
-			// Delete products XML cache
-			wrap.RemoveProductXmlCacheFile()
+			wrap.RecreateProductXmlFile()
 
 			wrap.ResetCacheBlocks()
 
@@ -111,8 +110,7 @@ func (this *Modules) RegisterAction_ShopCurrenciesModify() *Action {
 				return
 			}
 
-			// Delete products XML cache
-			wrap.RemoveProductXmlCacheFile()
+			wrap.RecreateProductXmlFile()
 
 			wrap.ResetCacheBlocks()
 

session.go

@@ -58,7 +58,7 @@ func session_clean_stop(ch, stop chan bool) {
 			<-ch
 			return
 		case <-time.After(3 * time.Second):
-			fmt.Println("Session cleaner error: force exit by timeout after 8 seconds")
+			fmt.Println("Session error: force exit by timeout after 3 seconds")
 			return
 		}
 	}

modules/module_api_xml.go → xml.go

@@ -1,17 +1,22 @@
-package modules
+package main
 
 import (
+	"fmt"
 	"html"
+	"io/ioutil"
+	"os"
 	"strings"
 	"time"
 
-	"golang-fave/engine/wrapper"
+	"golang-fave/engine/mysqlpool"
+	"golang-fave/engine/sqlw"
+	"golang-fave/engine/wrapper/config"
 	"golang-fave/utils"
 )
 
-func (this *Modules) api_GenerateXmlCurrencies(wrap *wrapper.Wrapper) string {
+func xml_gen_currencies(db *sqlw.DB, conf *config.Config) string {
 	result := ``
-	rows, err := wrap.DB.Query(
+	rows, err := db.Query(
 		`SELECT
 			code,
 			coefficient
@@ -38,9 +43,9 @@ func (this *Modules) api_GenerateXmlCurrencies(wrap *wrapper.Wrapper) string {
 	return result
 }
 
-func (this *Modules) api_GenerateXmlCategories(wrap *wrapper.Wrapper) string {
+func xml_gen_categories(db *sqlw.DB, conf *config.Config) string {
 	result := ``
-	rows, err := wrap.DB.Query(
+	rows, err := db.Query(
 		`SELECT
 			data.id,
 			data.user,
@@ -97,9 +102,9 @@ func (this *Modules) api_GenerateXmlCategories(wrap *wrapper.Wrapper) string {
 	return result
 }
 
-func (this *Modules) api_GenerateXmlOfferPictures(wrap *wrapper.Wrapper, product_id int) string {
+func xml_gen_offer_pictures(db *sqlw.DB, conf *config.Config, product_id int) string {
 	result := ``
-	rows, err := wrap.DB.Query(
+	rows, err := db.Query(
 		`SELECT
 			shop_product_images.product_id,
 			shop_product_images.filename
@@ -120,19 +125,19 @@ func (this *Modules) api_GenerateXmlOfferPictures(wrap *wrapper.Wrapper, product
 		for rows.Next() {
 			err = rows.Scan(scan...)
 			if err == nil {
-				result += `<picture>` + html.EscapeString((*wrap.Config).API.XML.Url) + `products/images/` + html.EscapeString(string(values[0])) + `/` + html.EscapeString(string(values[1])) + `</picture>`
+				result += `<picture>` + html.EscapeString((*conf).API.XML.Url) + `products/images/` + html.EscapeString(string(values[0])) + `/` + html.EscapeString(string(values[1])) + `</picture>`
 			}
 		}
 	}
 	return result
 }
 
-func (this *Modules) api_GenerateXmlOfferAttributes(wrap *wrapper.Wrapper, product_id int) string {
+func xml_gen_offer_attributes(db *sqlw.DB, conf *config.Config, product_id int) string {
 	result := ``
 	filter_ids := []int{}
 	filter_names := map[int]string{}
 	filter_values := map[int][]string{}
-	rows, err := wrap.DB.Query(
+	rows, err := db.Query(
 		`SELECT
 			shop_filters.id,
 			shop_filters.filter,
@@ -173,9 +178,9 @@ func (this *Modules) api_GenerateXmlOfferAttributes(wrap *wrapper.Wrapper, produ
 	return result
 }
 
-func (this *Modules) api_GenerateXmlOffers(wrap *wrapper.Wrapper) string {
+func xml_gen_offers(db *sqlw.DB, conf *config.Config) string {
 	result := ``
-	rows, err := wrap.DB.Query(
+	rows, err := db.Query(
 		`SELECT
 			shop_products.id,
 			shop_currencies.code,
@@ -207,16 +212,16 @@ func (this *Modules) api_GenerateXmlOffers(wrap *wrapper.Wrapper) string {
 			err = rows.Scan(scan...)
 			if err == nil {
 				result += `<offer id="` + html.EscapeString(string(values[0])) + `" available="true">`
-				result += `<url>` + html.EscapeString((*wrap.Config).API.XML.Url) + `shop/` + html.EscapeString(string(values[4])) + `/</url>`
+				result += `<url>` + html.EscapeString((*conf).API.XML.Url) + `shop/` + html.EscapeString(string(values[4])) + `/</url>`
 				result += `<price>` + utils.Float64ToStrF(utils.StrToFloat64(string(values[2])), "%.2f") + `</price>`
 				result += `<currencyId>` + html.EscapeString(string(values[1])) + `</currencyId>`
 				result += `<categoryId>` + html.EscapeString(string(values[7])) + `</categoryId>`
-				result += this.api_GenerateXmlOfferPictures(wrap, utils.StrToInt(string(values[0])))
+				result += xml_gen_offer_pictures(db, conf, utils.StrToInt(string(values[0])))
 				result += `<vendor>` + html.EscapeString(string(values[5])) + `</vendor>`
 				result += `<stock_quantity>` + html.EscapeString(string(values[6])) + `</stock_quantity>`
 				result += `<name>` + html.EscapeString(string(values[3])) + `</name>`
 				result += `<description><![CDATA[` + string(values[8]) + `]]></description>`
-				result += this.api_GenerateXmlOfferAttributes(wrap, utils.StrToInt(string(values[0])))
+				result += xml_gen_offer_attributes(db, conf, utils.StrToInt(string(values[0])))
 				result += `</offer>`
 			}
 		}
@@ -224,30 +229,101 @@ func (this *Modules) api_GenerateXmlOffers(wrap *wrapper.Wrapper) string {
 	return result
 }
 
-func (this *Modules) api_Generate(wrap *wrapper.Wrapper, currencies, categories, offers string) string {
+func xml_generate(db *sqlw.DB, conf *config.Config) string {
 	return `<?xml version="1.0" encoding="UTF-8"?>` +
 		`<!DOCTYPE yml_catalog SYSTEM "shops.dtd">` +
 		`<yml_catalog date="` + time.Unix(int64(time.Now().Unix()), 0).Format("2006-01-02 15:04") + `">` +
 		`<shop>` +
-		`<name>` + html.EscapeString((*wrap.Config).API.XML.Name) + `</name>` +
-		`<company>` + html.EscapeString((*wrap.Config).API.XML.Company) + `</company>` +
-		`<url>` + html.EscapeString((*wrap.Config).API.XML.Url) + `</url>` +
-		`<currencies>` + currencies + `</currencies>` +
-		`<categories>` + categories + `</categories>` +
-		`<offers>` + offers + `</offers>` +
+		`<name>` + html.EscapeString((*conf).API.XML.Name) + `</name>` +
+		`<company>` + html.EscapeString((*conf).API.XML.Company) + `</company>` +
+		`<url>` + html.EscapeString((*conf).API.XML.Url) + `</url>` +
+		`<currencies>` + xml_gen_currencies(db, conf) + `</currencies>` +
+		`<categories>` + xml_gen_categories(db, conf) + `</categories>` +
+		`<offers>` + xml_gen_offers(db, conf) + `</offers>` +
 		`</shop>` +
 		`</yml_catalog>`
 }
 
-func (this *Modules) api_GenerateXml(wrap *wrapper.Wrapper) string {
-	return this.api_Generate(
-		wrap,
-		this.api_GenerateXmlCurrencies(wrap),
-		this.api_GenerateXmlCategories(wrap),
-		this.api_GenerateXmlOffers(wrap),
-	)
+func xml_create(dir, host string, db *sqlw.DB) {
+	conf := config.ConfigNew()
+	if err := conf.ConfigRead(strings.Join([]string{dir, "config", "config.json"}, string(os.PathSeparator))); err == nil {
+		if (*conf).API.XML.Enabled == 1 {
+			if file, err := os.Create(strings.Join([]string{dir, "htdocs", "products.xml"}, string(os.PathSeparator))); err == nil {
+				file.Write([]byte(xml_generate(db, conf)))
+				file.Close()
+			} else {
+				fmt.Printf("Xml generation error (file): %v\n", err)
+			}
+		}
+	} else {
+		fmt.Printf("Xml generation error (config): %v\n", err)
+	}
+}
+
+func xml_detect(dir, host string, mp *mysqlpool.MySqlPool) {
+	db := mp.Get(host)
+	if db != nil {
+		trigger := strings.Join([]string{dir, "tmp", "trigger.xml.run"}, string(os.PathSeparator))
+		if utils.IsFileExists(trigger) {
+			if err := db.Ping(); err == nil {
+				xml_create(dir, host, db)
+				os.Remove(trigger)
+			}
+		}
+	}
+}
+
+func xml_loop(www_dir string, stop chan bool, mp *mysqlpool.MySqlPool) {
+	dirs, err := ioutil.ReadDir(www_dir)
+	if err == nil {
+		for _, dir := range dirs {
+			select {
+			case <-stop:
+				break
+			default:
+				if mp != nil {
+					target_dir := strings.Join([]string{www_dir, dir.Name()}, string(os.PathSeparator))
+					if utils.IsDirExists(target_dir) {
+						xml_detect(target_dir, dir.Name(), mp)
+					}
+				}
+			}
+		}
+	}
+}
+
+func xml_start(www_dir string, mp *mysqlpool.MySqlPool) (chan bool, chan bool) {
+	ch := make(chan bool)
+	stop := make(chan bool)
+
+	// Run at start
+	xml_loop(www_dir, stop, mp)
+
+	go func() {
+		for {
+			select {
+			case <-time.After(5 * time.Second):
+				// Run every 5 seconds
+				xml_loop(www_dir, stop, mp)
+			case <-ch:
+				ch <- true
+				return
+			}
+		}
+	}()
+	return ch, stop
 }
 
-func (this *Modules) api_GenerateEmptyXml(wrap *wrapper.Wrapper) string {
-	return this.api_Generate(wrap, "", "", "")
+func xml_stop(ch, stop chan bool) {
+	for {
+		select {
+		case stop <- true:
+		case ch <- true:
+			<-ch
+			return
+		case <-time.After(3 * time.Second):
+			fmt.Println("Xml error: force exit by timeout after 3 seconds")
+			return
+		}
+	}
 }