diff --git a/internal/apps/main.go b/internal/apps/main.go new file mode 100644 index 0000000..44794c4 --- /dev/null +++ b/internal/apps/main.go @@ -0,0 +1,11 @@ +// Copyright 2023 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn . + +package apps + +import teaconst "github.com/TeaOSLab/EdgeNode/internal/const" + +func RunMain(f func()) { + if teaconst.IsMain { + f() + } +} diff --git a/internal/caches/manager.go b/internal/caches/manager.go index 75b68f9..60c0a9a 100644 --- a/internal/caches/manager.go +++ b/internal/caches/manager.go @@ -3,6 +3,7 @@ package caches import ( "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" + teaconst "github.com/TeaOSLab/EdgeNode/internal/const" "github.com/TeaOSLab/EdgeNode/internal/events" "github.com/TeaOSLab/EdgeNode/internal/remotelogs" "github.com/iwind/TeaGo/lists" @@ -14,6 +15,10 @@ import ( var SharedManager = NewManager() func init() { + if !teaconst.IsMain { + return + } + events.On(events.EventQuit, func() { remotelogs.Println("CACHE", "quiting cache manager") SharedManager.UpdatePolicies([]*serverconfigs.HTTPCachePolicy{}) diff --git a/internal/compressions/reader_pool_brotli.go b/internal/compressions/reader_pool_brotli.go index 3e1b458..37bcbcf 100644 --- a/internal/compressions/reader_pool_brotli.go +++ b/internal/compressions/reader_pool_brotli.go @@ -11,7 +11,7 @@ import ( var sharedBrotliReaderPool *ReaderPool func init() { - if teaconst.IsDaemon { + if !teaconst.IsMain { return } diff --git a/internal/compressions/reader_pool_deflate.go b/internal/compressions/reader_pool_deflate.go index b154fa7..c83c607 100644 --- a/internal/compressions/reader_pool_deflate.go +++ b/internal/compressions/reader_pool_deflate.go @@ -11,7 +11,7 @@ import ( var sharedDeflateReaderPool *ReaderPool func init() { - if teaconst.IsDaemon { + if !teaconst.IsMain { return } diff --git a/internal/compressions/reader_pool_gzip.go b/internal/compressions/reader_pool_gzip.go index f5f638d..b6afe47 100644 --- a/internal/compressions/reader_pool_gzip.go +++ b/internal/compressions/reader_pool_gzip.go @@ -11,7 +11,7 @@ import ( var sharedGzipReaderPool *ReaderPool func init() { - if teaconst.IsDaemon { + if !teaconst.IsMain { return } diff --git a/internal/compressions/reader_pool_zstd.go b/internal/compressions/reader_pool_zstd.go index aa6aef5..375ef6a 100644 --- a/internal/compressions/reader_pool_zstd.go +++ b/internal/compressions/reader_pool_zstd.go @@ -11,7 +11,7 @@ import ( var sharedZSTDReaderPool *ReaderPool func init() { - if teaconst.IsDaemon { + if !teaconst.IsMain { return } diff --git a/internal/compressions/writer_pool_brotli.go b/internal/compressions/writer_pool_brotli.go index c966f18..304486a 100644 --- a/internal/compressions/writer_pool_brotli.go +++ b/internal/compressions/writer_pool_brotli.go @@ -12,7 +12,7 @@ import ( var sharedBrotliWriterPool *WriterPool func init() { - if teaconst.IsDaemon { + if !teaconst.IsMain { return } diff --git a/internal/compressions/writer_pool_deflate.go b/internal/compressions/writer_pool_deflate.go index 377b5b4..11f4a78 100644 --- a/internal/compressions/writer_pool_deflate.go +++ b/internal/compressions/writer_pool_deflate.go @@ -12,7 +12,7 @@ import ( var sharedDeflateWriterPool *WriterPool func init() { - if teaconst.IsDaemon { + if !teaconst.IsMain { return } diff --git a/internal/compressions/writer_pool_gzip.go b/internal/compressions/writer_pool_gzip.go index fc192c8..0b15f5e 100644 --- a/internal/compressions/writer_pool_gzip.go +++ b/internal/compressions/writer_pool_gzip.go @@ -12,7 +12,7 @@ import ( var sharedGzipWriterPool *WriterPool func init() { - if teaconst.IsDaemon { + if !teaconst.IsMain { return } diff --git a/internal/compressions/writer_pool_zstd.go b/internal/compressions/writer_pool_zstd.go index 1c5a0c3..2a146b3 100644 --- a/internal/compressions/writer_pool_zstd.go +++ b/internal/compressions/writer_pool_zstd.go @@ -12,7 +12,7 @@ import ( var sharedZSTDWriterPool *WriterPool func init() { - if teaconst.IsDaemon { + if !teaconst.IsMain { return } diff --git a/internal/const/vars.go b/internal/const/vars.go index 33ddc14..bd7986b 100644 --- a/internal/const/vars.go +++ b/internal/const/vars.go @@ -15,7 +15,7 @@ var ( NodeId int64 = 0 NodeIdString = "" - IsDaemon = len(os.Args) > 1 && os.Args[1] == "daemon" + IsMain = len(os.Args) == 1 GlobalProductName = nodeconfigs.DefaultProductName diff --git a/internal/firewalls/ddos_protection.go b/internal/firewalls/ddos_protection.go index 203c7c7..c80ded7 100644 --- a/internal/firewalls/ddos_protection.go +++ b/internal/firewalls/ddos_protection.go @@ -9,6 +9,7 @@ import ( "errors" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/ddosconfigs" + teaconst "github.com/TeaOSLab/EdgeNode/internal/const" "github.com/TeaOSLab/EdgeNode/internal/events" "github.com/TeaOSLab/EdgeNode/internal/firewalls/nftables" "github.com/TeaOSLab/EdgeNode/internal/remotelogs" @@ -27,6 +28,10 @@ import ( var SharedDDoSProtectionManager = NewDDoSProtectionManager() func init() { + if !teaconst.IsMain { + return + } + events.On(events.EventReload, func() { if nftablesInstance == nil { return diff --git a/internal/firewalls/firewall.go b/internal/firewalls/firewall.go index ea56c9e..fd6cce0 100644 --- a/internal/firewalls/firewall.go +++ b/internal/firewalls/firewall.go @@ -3,6 +3,7 @@ package firewalls import ( + teaconst "github.com/TeaOSLab/EdgeNode/internal/const" "github.com/TeaOSLab/EdgeNode/internal/events" "github.com/TeaOSLab/EdgeNode/internal/remotelogs" "runtime" @@ -14,6 +15,10 @@ var firewallLocker = &sync.Mutex{} // 初始化 func init() { + if !teaconst.IsMain { + return + } + events.On(events.EventLoaded, func() { var firewall = Firewall() if firewall.Name() != "mock" { diff --git a/internal/firewalls/firewall_nftables.go b/internal/firewalls/firewall_nftables.go index ff536bc..33bc688 100644 --- a/internal/firewalls/firewall_nftables.go +++ b/internal/firewalls/firewall_nftables.go @@ -24,7 +24,7 @@ import ( // check nft status, if being enabled we load it automatically func init() { - if teaconst.IsDaemon { + if !teaconst.IsMain { return } diff --git a/internal/firewalls/nftables/installer.go b/internal/firewalls/nftables/installer.go index 8283c0a..4f4e601 100644 --- a/internal/firewalls/nftables/installer.go +++ b/internal/firewalls/nftables/installer.go @@ -5,6 +5,7 @@ package nftables import ( "errors" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" + teaconst "github.com/TeaOSLab/EdgeNode/internal/const" "github.com/TeaOSLab/EdgeNode/internal/events" "github.com/TeaOSLab/EdgeNode/internal/goman" "github.com/TeaOSLab/EdgeNode/internal/remotelogs" @@ -17,6 +18,10 @@ import ( ) func init() { + if !teaconst.IsMain { + return + } + events.On(events.EventReload, func() { // linux only if runtime.GOOS != "linux" { diff --git a/internal/goman/lib.go b/internal/goman/lib.go index 92f3d2a..7f6d09c 100644 --- a/internal/goman/lib.go +++ b/internal/goman/lib.go @@ -15,7 +15,7 @@ var instanceId = uint64(0) // New 新创建goroutine func New(f func()) { - if teaconst.IsDaemon { + if !teaconst.IsMain { return } @@ -47,7 +47,7 @@ func New(f func()) { // NewWithArgs 创建带有参数的goroutine func NewWithArgs(f func(args ...interface{}), args ...interface{}) { - if teaconst.IsDaemon { + if !teaconst.IsMain { return } diff --git a/internal/iplibrary/manager_ip_list.go b/internal/iplibrary/manager_ip_list.go index eb68097..844a464 100644 --- a/internal/iplibrary/manager_ip_list.go +++ b/internal/iplibrary/manager_ip_list.go @@ -20,7 +20,7 @@ var SharedIPListManager = NewIPListManager() var IPListUpdateNotify = make(chan bool, 1) func init() { - if teaconst.IsDaemon { + if !teaconst.IsMain { return } diff --git a/internal/metrics/manager.go b/internal/metrics/manager.go index c49c591..e2b6685 100644 --- a/internal/metrics/manager.go +++ b/internal/metrics/manager.go @@ -4,6 +4,7 @@ package metrics import ( "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" + teaconst "github.com/TeaOSLab/EdgeNode/internal/const" "github.com/TeaOSLab/EdgeNode/internal/events" "github.com/TeaOSLab/EdgeNode/internal/remotelogs" "strconv" @@ -13,6 +14,10 @@ import ( var SharedManager = NewManager() func init() { + if !teaconst.IsMain { + return + } + events.On(events.EventQuit, func() { SharedManager.Quit() }) diff --git a/internal/monitor/value_queue.go b/internal/monitor/value_queue.go index b46936b..fc8cc41 100644 --- a/internal/monitor/value_queue.go +++ b/internal/monitor/value_queue.go @@ -5,6 +5,7 @@ package monitor import ( "encoding/json" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + teaconst "github.com/TeaOSLab/EdgeNode/internal/const" "github.com/TeaOSLab/EdgeNode/internal/events" "github.com/TeaOSLab/EdgeNode/internal/goman" "github.com/TeaOSLab/EdgeNode/internal/remotelogs" @@ -16,6 +17,10 @@ import ( var SharedValueQueue = NewValueQueue() func init() { + if !teaconst.IsMain { + return + } + events.On(events.EventLoaded, func() { goman.New(func() { SharedValueQueue.Start() diff --git a/internal/nodes/client_conn_traffic.go b/internal/nodes/client_conn_traffic.go index ed3feb6..b03d358 100644 --- a/internal/nodes/client_conn_traffic.go +++ b/internal/nodes/client_conn_traffic.go @@ -15,6 +15,10 @@ import ( // 发送监控流量 func init() { + if !teaconst.IsMain { + return + } + events.On(events.EventStart, func() { var ticker = time.NewTicker(1 * time.Minute) goman.New(func() { diff --git a/internal/nodes/http_cache_task_manager.go b/internal/nodes/http_cache_task_manager.go index b3c4f68..710a1c5 100644 --- a/internal/nodes/http_cache_task_manager.go +++ b/internal/nodes/http_cache_task_manager.go @@ -9,6 +9,7 @@ import ( "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeNode/internal/caches" "github.com/TeaOSLab/EdgeNode/internal/compressions" + teaconst "github.com/TeaOSLab/EdgeNode/internal/const" "github.com/TeaOSLab/EdgeNode/internal/events" "github.com/TeaOSLab/EdgeNode/internal/goman" "github.com/TeaOSLab/EdgeNode/internal/remotelogs" @@ -23,6 +24,10 @@ import ( ) func init() { + if !teaconst.IsMain { + return + } + events.On(events.EventStart, func() { goman.New(func() { SharedHTTPCacheTaskManager.Start() diff --git a/internal/nodes/http_writer.go b/internal/nodes/http_writer.go index 8d61f90..94392ee 100644 --- a/internal/nodes/http_writer.go +++ b/internal/nodes/http_writer.go @@ -10,6 +10,7 @@ import ( "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeNode/internal/caches" "github.com/TeaOSLab/EdgeNode/internal/compressions" + teaconst "github.com/TeaOSLab/EdgeNode/internal/const" "github.com/TeaOSLab/EdgeNode/internal/remotelogs" "github.com/TeaOSLab/EdgeNode/internal/utils" "github.com/TeaOSLab/EdgeNode/internal/utils/readers" @@ -39,6 +40,10 @@ var webpMaxBufferSize int64 = 1_000_000_000 var webpTotalBufferSize int64 = 0 func init() { + if !teaconst.IsMain { + return + } + var systemMemory = utils.SystemMemoryGB() / 8 if systemMemory > 0 { webpMaxBufferSize = int64(systemMemory) * 1024 * 1024 * 1024 diff --git a/internal/nodes/node.go b/internal/nodes/node.go index 857f5c1..79795f6 100644 --- a/internal/nodes/node.go +++ b/internal/nodes/node.go @@ -236,8 +236,6 @@ func (this *Node) Start() { // Daemon 实现守护进程 func (this *Node) Daemon() { - teaconst.IsDaemon = true - var isDebug = lists.ContainsString(os.Args, "debug") for { conn, err := this.sock.Dial() diff --git a/internal/nodes/origin_state_manager.go b/internal/nodes/origin_state_manager.go index 0cefe81..e6ea09a 100644 --- a/internal/nodes/origin_state_manager.go +++ b/internal/nodes/origin_state_manager.go @@ -4,6 +4,7 @@ package nodes import ( "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" + teaconst "github.com/TeaOSLab/EdgeNode/internal/const" "github.com/TeaOSLab/EdgeNode/internal/events" "github.com/TeaOSLab/EdgeNode/internal/goman" "github.com/TeaOSLab/EdgeNode/internal/remotelogs" @@ -16,6 +17,10 @@ import ( var SharedOriginStateManager = NewOriginStateManager() func init() { + if !teaconst.IsMain { + return + } + events.On(events.EventLoaded, func() { goman.New(func() { SharedOriginStateManager.Start() diff --git a/internal/nodes/system_services.go b/internal/nodes/system_services.go index 18ee34f..1b50349 100644 --- a/internal/nodes/system_services.go +++ b/internal/nodes/system_services.go @@ -19,6 +19,10 @@ import ( ) func init() { + if !teaconst.IsMain { + return + } + var manager = NewSystemServiceManager() events.On(events.EventReload, func() { goman.New(func() { diff --git a/internal/nodes/task_ocsp_update.go b/internal/nodes/task_ocsp_update.go index 068738f..787e5d1 100644 --- a/internal/nodes/task_ocsp_update.go +++ b/internal/nodes/task_ocsp_update.go @@ -4,6 +4,7 @@ package nodes import ( "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + teaconst "github.com/TeaOSLab/EdgeNode/internal/const" "github.com/TeaOSLab/EdgeNode/internal/events" "github.com/TeaOSLab/EdgeNode/internal/goman" "github.com/TeaOSLab/EdgeNode/internal/remotelogs" @@ -15,6 +16,10 @@ import ( var sharedOCSPTask = NewOCSPUpdateTask() func init() { + if !teaconst.IsMain { + return + } + events.On(events.EventLoaded, func() { sharedOCSPTask.version = sharedNodeConfig.OCSPVersion diff --git a/internal/nodes/task_sync_api_nodes.go b/internal/nodes/task_sync_api_nodes.go index 259b5b0..ff4f5b4 100644 --- a/internal/nodes/task_sync_api_nodes.go +++ b/internal/nodes/task_sync_api_nodes.go @@ -3,6 +3,7 @@ package nodes import ( "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeNode/internal/configs" + teaconst "github.com/TeaOSLab/EdgeNode/internal/const" "github.com/TeaOSLab/EdgeNode/internal/events" "github.com/TeaOSLab/EdgeNode/internal/goman" "github.com/TeaOSLab/EdgeNode/internal/rpc" @@ -16,6 +17,10 @@ import ( var sharedSyncAPINodesTask = NewSyncAPINodesTask() func init() { + if !teaconst.IsMain { + return + } + events.On(events.EventStart, func() { goman.New(func() { sharedSyncAPINodesTask.Start() diff --git a/internal/nodes/toa_manager.go b/internal/nodes/toa_manager.go index 73662b7..418fc81 100644 --- a/internal/nodes/toa_manager.go +++ b/internal/nodes/toa_manager.go @@ -3,6 +3,7 @@ package nodes import ( "errors" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" + teaconst "github.com/TeaOSLab/EdgeNode/internal/const" "github.com/TeaOSLab/EdgeNode/internal/events" "github.com/TeaOSLab/EdgeNode/internal/goman" "github.com/TeaOSLab/EdgeNode/internal/remotelogs" @@ -17,6 +18,10 @@ import ( var sharedTOAManager = NewTOAManager() func init() { + if !teaconst.IsMain { + return + } + events.On(events.EventReload, func() { err := sharedTOAManager.Run(sharedNodeConfig.TOA) if err != nil { diff --git a/internal/remotelogs/utils.go b/internal/remotelogs/utils.go index ba329d9..331bdd7 100644 --- a/internal/remotelogs/utils.go +++ b/internal/remotelogs/utils.go @@ -20,6 +20,10 @@ import ( var logChan = make(chan *pb.NodeLog, 64) // 队列数量不需要太长，因为日志通常仅仅为调试用 func init() { + if !teaconst.IsMain { + return + } + // 定期上传日志 var ticker = time.NewTicker(60 * time.Second) if Tea.IsTesting() { diff --git a/internal/stats/bandwidth_stat_manager.go b/internal/stats/bandwidth_stat_manager.go index c28d3d2..ee69981 100644 --- a/internal/stats/bandwidth_stat_manager.go +++ b/internal/stats/bandwidth_stat_manager.go @@ -5,6 +5,7 @@ package stats import ( "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + teaconst "github.com/TeaOSLab/EdgeNode/internal/const" "github.com/TeaOSLab/EdgeNode/internal/events" "github.com/TeaOSLab/EdgeNode/internal/goman" "github.com/TeaOSLab/EdgeNode/internal/remotelogs" @@ -21,6 +22,10 @@ var SharedBandwidthStatManager = NewBandwidthStatManager() const bandwidthTimestampDelim = 2 // N秒平均，更为精确 func init() { + if !teaconst.IsMain { + return + } + events.On(events.EventLoaded, func() { goman.New(func() { SharedBandwidthStatManager.Start() diff --git a/internal/utils/agents/manager.go b/internal/utils/agents/manager.go index d8b46f5..52a65ce 100644 --- a/internal/utils/agents/manager.go +++ b/internal/utils/agents/manager.go @@ -4,6 +4,7 @@ package agents import ( "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + teaconst "github.com/TeaOSLab/EdgeNode/internal/const" "github.com/TeaOSLab/EdgeNode/internal/events" "github.com/TeaOSLab/EdgeNode/internal/goman" "github.com/TeaOSLab/EdgeNode/internal/remotelogs" @@ -16,6 +17,10 @@ import ( var SharedManager = NewManager() func init() { + if !teaconst.IsMain { + return + } + events.On(events.EventLoaded, func() { goman.New(func() { SharedManager.Start() diff --git a/internal/utils/agents/queue.go b/internal/utils/agents/queue.go index c4d82b1..56ee9ba 100644 --- a/internal/utils/agents/queue.go +++ b/internal/utils/agents/queue.go @@ -4,6 +4,7 @@ package agents import ( "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + teaconst "github.com/TeaOSLab/EdgeNode/internal/const" "github.com/TeaOSLab/EdgeNode/internal/events" "github.com/TeaOSLab/EdgeNode/internal/goman" "github.com/TeaOSLab/EdgeNode/internal/remotelogs" @@ -13,6 +14,10 @@ import ( ) func init() { + if !teaconst.IsMain { + return + } + events.On(events.EventLoaded, func() { goman.New(func() { SharedQueue.Start() diff --git a/internal/utils/clock/manager.go b/internal/utils/clock/manager.go index 5cd51cb..fc39806 100644 --- a/internal/utils/clock/manager.go +++ b/internal/utils/clock/manager.go @@ -6,6 +6,7 @@ import ( "encoding/binary" "errors" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" + teaconst "github.com/TeaOSLab/EdgeNode/internal/const" "github.com/TeaOSLab/EdgeNode/internal/events" "github.com/TeaOSLab/EdgeNode/internal/goman" "github.com/TeaOSLab/EdgeNode/internal/remotelogs" @@ -21,6 +22,10 @@ var hasSynced = false var sharedClockManager = NewClockManager() func init() { + if !teaconst.IsMain { + return + } + events.On(events.EventLoaded, func() { goman.New(sharedClockManager.Start) }) diff --git a/internal/utils/dbs/query_stat_manager.go b/internal/utils/dbs/query_stat_manager.go index 8ecbd29..7c16b8d 100644 --- a/internal/utils/dbs/query_stat_manager.go +++ b/internal/utils/dbs/query_stat_manager.go @@ -15,6 +15,10 @@ import ( ) func init() { + if !teaconst.IsMain { + return + } + var ticker = time.NewTicker(5 * time.Second) events.On(events.EventLoaded, func() { diff --git a/internal/utils/encrypt.go b/internal/utils/encrypt.go index 2bf38e6..5abcb00 100644 --- a/internal/utils/encrypt.go +++ b/internal/utils/encrypt.go @@ -10,6 +10,7 @@ import ( "encoding/json" "errors" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" + teaconst "github.com/TeaOSLab/EdgeNode/internal/const" "github.com/TeaOSLab/EdgeNode/internal/events" "github.com/iwind/TeaGo/logs" "github.com/iwind/TeaGo/maps" @@ -22,6 +23,10 @@ var ( ) func init() { + if !teaconst.IsMain { + return + } + events.On(events.EventReload, func() { nodeConfig, _ := nodeconfigs.SharedNodeConfig() if nodeConfig != nil { diff --git a/internal/utils/free_hours_manager.go b/internal/utils/free_hours_manager.go index f99af19..55da006 100644 --- a/internal/utils/free_hours_manager.go +++ b/internal/utils/free_hours_manager.go @@ -15,6 +15,10 @@ import ( var SharedFreeHoursManager = NewFreeHoursManager() func init() { + if !teaconst.IsMain { + return + } + events.On(events.EventLoaded, func() { goman.New(func() { SharedFreeHoursManager.Start() diff --git a/internal/utils/system.go b/internal/utils/system.go index 0e05ece..031d4fa 100644 --- a/internal/utils/system.go +++ b/internal/utils/system.go @@ -3,12 +3,17 @@ package utils import ( + teaconst "github.com/TeaOSLab/EdgeNode/internal/const" "github.com/shirou/gopsutil/v3/mem" ) var systemTotalMemory = -1 func init() { + if !teaconst.IsMain { + return + } + _ = SystemMemoryGB() } diff --git a/internal/utils/time.go b/internal/utils/time.go index e38c79a..28fef32 100644 --- a/internal/utils/time.go +++ b/internal/utils/time.go @@ -1,6 +1,7 @@ package utils import ( + teaconst "github.com/TeaOSLab/EdgeNode/internal/const" "github.com/TeaOSLab/EdgeNode/internal/goman" "github.com/iwind/TeaGo/types" "time" @@ -11,6 +12,10 @@ var unixTimeMilli = time.Now().UnixMilli() var unixTimeMilliString = types.String(unixTimeMilli) func init() { + if !teaconst.IsMain { + return + } + var ticker = time.NewTicker(200 * time.Millisecond) goman.New(func() { for range ticker.C { diff --git a/internal/waf/action_notify.go b/internal/waf/action_notify.go index 77bc068..b152edc 100644 --- a/internal/waf/action_notify.go +++ b/internal/waf/action_notify.go @@ -4,6 +4,7 @@ package waf import ( "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + teaconst "github.com/TeaOSLab/EdgeNode/internal/const" "github.com/TeaOSLab/EdgeNode/internal/events" "github.com/TeaOSLab/EdgeNode/internal/goman" "github.com/TeaOSLab/EdgeNode/internal/remotelogs" @@ -25,6 +26,10 @@ type notifyTask struct { var notifyChan = make(chan *notifyTask, 128) func init() { + if !teaconst.IsMain { + return + } + events.On(events.EventLoaded, func() { goman.New(func() { rpcClient, err := rpc.SharedRPC() diff --git a/internal/waf/action_record_ip.go b/internal/waf/action_record_ip.go index a0ac7f6..6f3fd73 100644 --- a/internal/waf/action_record_ip.go +++ b/internal/waf/action_record_ip.go @@ -33,6 +33,10 @@ type recordIPTask struct { var recordIPTaskChan = make(chan *recordIPTask, 1024) func init() { + if !teaconst.IsMain { + return + } + events.On(events.EventLoaded, func() { goman.New(func() { rpcClient, err := rpc.SharedRPC()