From 5cf1f64615488bde58b5bbfc3111776359d69fdd Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Wed, 11 Sep 2024 11:33:02 -0700 Subject: [PATCH 1/5] 17444 fix event rules jobs enqueue --- netbox/netbox/jobs.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/netbox/netbox/jobs.py b/netbox/netbox/jobs.py index b0fcc3e9944..76bbd54475a 100644 --- a/netbox/netbox/jobs.py +++ b/netbox/netbox/jobs.py @@ -100,7 +100,11 @@ def enqueue(cls, *args, **kwargs): This method is a wrapper of `Job.enqueue()` using `handle()` as function callback. See its documentation for parameters. """ - return Job.enqueue(cls.handle, name=cls.name, *args, **kwargs) + name = kwargs.pop('name', None) + if not name: + name = cls.name + + return Job.enqueue(cls.handle, name=name, *args, **kwargs) @classmethod @advisory_lock(ADVISORY_LOCK_KEYS['job-schedules']) From 6966cb45cb5603725adde3d2235fb3da5f568526 Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Wed, 11 Sep 2024 11:38:27 -0700 Subject: [PATCH 2/5] 17444 fix event rules jobs enqueue --- netbox/netbox/jobs.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/netbox/netbox/jobs.py b/netbox/netbox/jobs.py index 76bbd54475a..3ae07d4d7c7 100644 --- a/netbox/netbox/jobs.py +++ b/netbox/netbox/jobs.py @@ -93,14 +93,13 @@ def get_jobs(cls, instance=None): return jobs @classmethod - def enqueue(cls, *args, **kwargs): + def enqueue(cls, name=None, *args, **kwargs): """ Enqueue a new `Job`. This method is a wrapper of `Job.enqueue()` using `handle()` as function callback. See its documentation for parameters. """ - name = kwargs.pop('name', None) if not name: name = cls.name From 919d16cbd3bd2a27e4c5ce587474ad57aa60c24b Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Wed, 11 Sep 2024 11:58:31 -0700 Subject: [PATCH 3/5] 17444 fix event rules jobs enqueue --- netbox/netbox/jobs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/netbox/netbox/jobs.py b/netbox/netbox/jobs.py index 3ae07d4d7c7..76bbd54475a 100644 --- a/netbox/netbox/jobs.py +++ b/netbox/netbox/jobs.py @@ -93,13 +93,14 @@ def get_jobs(cls, instance=None): return jobs @classmethod - def enqueue(cls, name=None, *args, **kwargs): + def enqueue(cls, *args, **kwargs): """ Enqueue a new `Job`. This method is a wrapper of `Job.enqueue()` using `handle()` as function callback. See its documentation for parameters. """ + name = kwargs.pop('name', None) if not name: name = cls.name From 3082b20bf54f4b1719f4bed1f533a75f25e91dd3 Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Wed, 11 Sep 2024 14:06:37 -0700 Subject: [PATCH 4/5] 17444 cleanup --- netbox/netbox/jobs.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/netbox/netbox/jobs.py b/netbox/netbox/jobs.py index 76bbd54475a..46d9781828a 100644 --- a/netbox/netbox/jobs.py +++ b/netbox/netbox/jobs.py @@ -100,9 +100,7 @@ def enqueue(cls, *args, **kwargs): This method is a wrapper of `Job.enqueue()` using `handle()` as function callback. See its documentation for parameters. """ - name = kwargs.pop('name', None) - if not name: - name = cls.name + name = kwargs.pop('name', None) or cls.name return Job.enqueue(cls.handle, name=name, *args, **kwargs) From 4a57d36c905fcab6e82e89ee8454c3b6e189a164 Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Wed, 11 Sep 2024 14:07:32 -0700 Subject: [PATCH 5/5] 17444 cleanup --- netbox/netbox/jobs.py | 1 - 1 file changed, 1 deletion(-) diff --git a/netbox/netbox/jobs.py b/netbox/netbox/jobs.py index 46d9781828a..087c2489687 100644 --- a/netbox/netbox/jobs.py +++ b/netbox/netbox/jobs.py @@ -101,7 +101,6 @@ def enqueue(cls, *args, **kwargs): parameters. """ name = kwargs.pop('name', None) or cls.name - return Job.enqueue(cls.handle, name=name, *args, **kwargs) @classmethod