Optimise golbat #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

jfberry wants to merge 38 commits into main from dirtyflag_prototype

api.md

Large diffs are not rendered by default.

config.toml.example

-Original file line number
+Diff line change
@@ Expand Up @@
     device_hours = 24               # Remove devices from in memory after not seen for x hours
     forts_stale_threshold = 3600    # Seconds before a fort is considered stale (default: 1 hour)
+    [tuning]
+    # When enabled, reduce_updates will make fort update debounce windows much longer
+    # to reduce database churn. Specifically, gym/pokestop/station debounce will be
+    # extended from 15 minutes (900s) to 12 hours (43200s) and spawnpoint last_seen
+    # will be updated every 12 hours instead of the default 6 hours.
+    reduce_updates = false
     [logging]
     debug = false
     save_logs = true
@@ Expand Down @@

config/config.go

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,26 +7,25 @@ import ( @@
     )
     type configDefinition struct {
-    	Port                           int        `koanf:"port"`
-    	GrpcPort                       int        `koanf:"grpc_port"`
-    	Webhooks                       []Webhook  `koanf:"webhooks"`
-    	Database                       database   `koanf:"database"`
-    	Logging                        logging    `koanf:"logging"`
-    	Sentry                         sentry     `koanf:"sentry"`
-    	Pyroscope                      pyroscope  `koanf:"pyroscope"`
-    	Prometheus                     Prometheus `koanf:"prometheus"`
-    	PokemonMemoryOnly              bool       `koanf:"pokemon_memory_only"`
-    	PokemonInternalToDb            bool       `koanf:"pokemon_internal_to_db"`
-    	TestFortInMemory               bool       `koanf:"test_fort_in_memory"`
-    	Cleanup                        cleanup    `koanf:"cleanup"`
-    	RawBearer                      string     `koanf:"raw_bearer"`
-    	ApiSecret                      string     `koanf:"api_secret"`
-    	Pvp                            pvp        `koanf:"pvp"`
-    	Koji                           koji       `koanf:"koji"`
-    	Tuning                         tuning     `koanf:"tuning"`
-    	Weather                        weather    `koanf:"weather"`
-    	ScanRules                      []scanRule `koanf:"scan_rules"`
-    	MaxConcurrentProactiveIVSwitch int        `koanf:"max_concurrent_proactive_iv_switch"`
+    	Port                int        `koanf:"port"`
+    	GrpcPort            int        `koanf:"grpc_port"`
+    	Webhooks            []Webhook  `koanf:"webhooks"`
+    	Database            database   `koanf:"database"`
+    	Logging             logging    `koanf:"logging"`
+    	Sentry              sentry     `koanf:"sentry"`
+    	Pyroscope           pyroscope  `koanf:"pyroscope"`
+    	Prometheus          Prometheus `koanf:"prometheus"`
+    	PokemonMemoryOnly   bool       `koanf:"pokemon_memory_only"`
+    	PokemonInternalToDb bool       `koanf:"pokemon_internal_to_db"`
+    	TestFortInMemory    bool       `koanf:"test_fort_in_memory"`
+    	Cleanup             cleanup    `koanf:"cleanup"`
+    	RawBearer           string     `koanf:"raw_bearer"`
+    	ApiSecret           string     `koanf:"api_secret"`
+    	Pvp                 pvp        `koanf:"pvp"`
+    	Koji                koji       `koanf:"koji"`
+    	Tuning              tuning     `koanf:"tuning"`
+    	Weather             weather    `koanf:"weather"`
+    	ScanRules           []scanRule `koanf:"scan_rules"`
     }
     func (configDefinition configDefinition) GetWebhookInterval() time.Duration {
@@ Expand Down Expand Up / @@ -120,10 +119,12 @@ type database struct { @@
     }
     type tuning struct {
-    	ExtendedTimeout    bool    `koanf:"extended_timeout"`
-    	MaxPokemonResults  int     `koanf:"max_pokemon_results"`
-    	MaxPokemonDistance float64 `koanf:"max_pokemon_distance"`
-    	ProfileRoutes      bool    `koanf:"profile_routes"`
+    	ExtendedTimeout                bool    `koanf:"extended_timeout"`
+    	MaxPokemonResults              int     `koanf:"max_pokemon_results"`
+    	MaxPokemonDistance             float64 `koanf:"max_pokemon_distance"`
+    	ProfileRoutes                  bool    `koanf:"profile_routes"`
+    	MaxConcurrentProactiveIVSwitch int     `koanf:"max_concurrent_proactive_iv_switch"`
+    	ReduceUpdates                  bool    `koanf:"reduce_updates"`
     }
     type scanRule struct {
@@ Expand All / @@ -133,6 +134,7 @@ type scanRule struct { @@
     	ProcessPokemon           *bool          `koanf:"pokemon"`
     	ProcessWilds             *bool          `koanf:"wild_pokemon"`
     	ProcessNearby            *bool          `koanf:"nearby_pokemon"`
+    	ProcessNearbyCell        *bool          `koanf:"nearby_cell_pokemon"`
     	ProcessWeather           *bool          `koanf:"weather"`
     	ProcessCells             *bool          `koanf:"cells"`
     	ProcessPokestops         *bool          `koanf:"pokestops"`
@@ Expand Down @@

config/reader.go

-Original file line number
+Diff line change
@@ Expand Up / @@ -51,8 +51,10 @@ func ReadConfig() (configDefinition, error) { @@
     			MaxPool: 100,
     		},
     		Tuning: tuning{
-    			MaxPokemonResults:  3000,
-    			MaxPokemonDistance: 100,
+    			MaxPokemonResults:              3000,
+    			MaxPokemonDistance:             100,
+    			MaxConcurrentProactiveIVSwitch: 6,
+    			ReduceUpdates:                  false,
     		},
     		Weather: weather{
     			ProactiveIVSwitching:     true,
@@ Expand All / @@ -61,7 +63,6 @@ func ReadConfig() (configDefinition, error) { @@
     		Pvp: pvp{
     			LevelCaps: []int{50, 51},
     		},
-    		MaxConcurrentProactiveIVSwitch: 6,
     	}, "koanf"), nil)
     	if defaultErr != nil {
     		fmt.Println(fmt.Errorf("failed to load default config: %w", defaultErr))
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Optimise golbat #332

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Optimise golbat #332

Are you sure you want to change the base?

Uh oh!

Optimise golbat #332

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!