Export updates module event names

This commit is contained in:
Patrick Pacher
2020-04-03 14:17:33 +02:00
committed by ppacher
parent a5fd348b96
commit 85b5cf02a4
5 changed files with 30 additions and 15 deletions

View File

@@ -56,7 +56,7 @@ func updateRegistryConfig(_ context.Context, _ interface{}) error {
if changed { if changed {
registry.SelectVersions() registry.SelectVersions()
module.TriggerEvent(eventVersionUpdate, nil) module.TriggerEvent(VersionUpdateEvent, nil)
} }
return nil return nil

View File

@@ -50,8 +50,8 @@ func initVersionExport() (err error) {
} }
return module.RegisterEventHook( return module.RegisterEventHook(
"updates", ModuleName,
eventVersionUpdate, VersionUpdateEvent,
"export version status", "export version status",
export, export,
) )

View File

@@ -20,7 +20,7 @@ func GetPlatformFile(identifier string) (*updater.File, error) {
return nil, err return nil, err
} }
module.TriggerEvent(eventVersionUpdate, nil) module.TriggerEvent(VersionUpdateEvent, nil)
return file, nil return file, nil
} }
@@ -33,6 +33,6 @@ func GetFile(identifier string) (*updater.File, error) {
return nil, err return nil, err
} }
module.TriggerEvent(eventVersionUpdate, nil) module.TriggerEvent(VersionUpdateEvent, nil)
return file, nil return file, nil
} }

View File

@@ -19,8 +19,23 @@ const (
releaseChannelStable = "stable" releaseChannelStable = "stable"
releaseChannelBeta = "beta" releaseChannelBeta = "beta"
eventVersionUpdate = "active version update" // ModuleName is the name of the update module
eventResourceUpdate = "resource update" // and can be used when declaring module dependencies.
ModuleName = "updates"
// VersionUpdateEvent is emitted every time a new
// version of a monitored resource is selected.
// During module initialization VersionUpdateEvent
// is also emitted.
VersionUpdateEvent = "active version update"
// ResourceUpdateEvent is emitted every time the
// updater successfully performed a resource update.
// ResourceUpdateEvent is emitted even if no new
// versions are available. Subscribers are expected
// to check if new versions of their resources are
// available by checking File.UpgradeAvailable().
ResourceUpdateEvent = "resource update"
) )
var ( var (
@@ -29,9 +44,9 @@ var (
) )
func init() { func init() {
module = modules.Register("updates", registerConfig, start, stop, "base") module = modules.Register(ModuleName, registerConfig, start, stop, "base")
module.RegisterEvent(eventVersionUpdate) module.RegisterEvent(VersionUpdateEvent)
module.RegisterEvent(eventResourceUpdate) module.RegisterEvent(ResourceUpdateEvent)
} }
func start() error { func start() error {
@@ -57,7 +72,7 @@ func start() error {
// create registry // create registry
registry = &updater.ResourceRegistry{ registry = &updater.ResourceRegistry{
Name: "updates", Name: ModuleName,
UpdateURLs: []string{ UpdateURLs: []string{
"https://updates.safing.io", "https://updates.safing.io",
}, },
@@ -83,7 +98,7 @@ func start() error {
} }
registry.SelectVersions() registry.SelectVersions()
module.TriggerEvent(eventVersionUpdate, nil) module.TriggerEvent(VersionUpdateEvent, nil)
err = initVersionExport() err = initVersionExport()
if err != nil { if err != nil {
@@ -96,7 +111,7 @@ func start() error {
if err != nil { if err != nil {
return fmt.Errorf("updates: failed to update: %s", err) return fmt.Errorf("updates: failed to update: %s", err)
} }
module.TriggerEvent(eventResourceUpdate, nil) module.TriggerEvent(ResourceUpdateEvent, nil)
return nil return nil
}).Repeat(24 * time.Hour).MaxDelay(1 * time.Hour).Schedule(time.Now().Add(10 * time.Second)) }).Repeat(24 * time.Hour).MaxDelay(1 * time.Hour).Schedule(time.Now().Add(10 * time.Second))

View File

@@ -37,8 +37,8 @@ var (
func initUpgrader() error { func initUpgrader() error {
return module.RegisterEventHook( return module.RegisterEventHook(
"updates", ModuleName,
eventResourceUpdate, ResourceUpdateEvent,
"run upgrades", "run upgrades",
upgrader, upgrader,
) )