Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
Base Worker
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Workers
Base Worker
Commits
e0c32a44
Commit
e0c32a44
authored
2 years ago
by
Chaza Abdelwahab
Browse files
Options
Downloads
Plain Diff
merge
parents
dd38096d
e1fdd69e
No related branches found
No related tags found
1 merge request
!176
Draft: Resolve "Move developer setup in a dedicated method"
Pipeline
#79283
failed
2 years ago
Stage: test
Stage: build
Stage: release
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
arkindex_worker/worker/base.py
+14
-11
14 additions, 11 deletions
arkindex_worker/worker/base.py
tests/test_elements_worker/test_worker.py
+1
-1
1 addition, 1 deletion
tests/test_elements_worker/test_worker.py
with
15 additions
and
12 deletions
arkindex_worker/worker/base.py
+
14
−
11
View file @
e0c32a44
...
...
@@ -135,9 +135,8 @@ class BaseWorker(object):
def
configure_for_developers
(
self
):
# CLI args are stored on the instance so that implementations can access them
self
.
args
=
self
.
parser
.
parse_args
()
# Setup logging level if verbose or if ARKINDEX_DEBUG is set to true
if
self
.
args
.
verbose
or
os
.
environ
.
get
(
"
ARKINDEX_DEBUG
"
):
# Setup logging level
if
self
.
args
.
verbose
:
logger
.
setLevel
(
logging
.
DEBUG
)
logger
.
debug
(
"
Debug output enabled
"
)
if
self
.
args
.
config
:
...
...
@@ -167,14 +166,18 @@ class BaseWorker(object):
self
.
api_client
=
ArkindexClient
(
**
options_from_env
())
logger
.
debug
(
f
"
Setup Arkindex API client on
{
self
.
api_client
.
document
.
url
}
"
)
# Load process information except in developer mode
if
not
self
.
args
.
dev
:
assert
os
.
environ
.
get
(
"
ARKINDEX_PROCESS_ID
"
),
"
ARKINDEX_PROCESS_ID environment variable is not defined
"
self
.
process_information
=
self
.
request
(
"
RetrieveDataImport
"
,
id
=
os
.
environ
[
"
ARKINDEX_PROCESS_ID
"
]
)
# Load features available on backend, and check authentication
user
=
self
.
request
(
"
RetrieveUser
"
)
logger
.
debug
(
f
"
Connected as
{
user
[
'
display_name
'
]
}
-
{
user
[
'
email
'
]
}
"
)
self
.
features
=
user
[
"
features
"
]
# Load process information
assert
os
.
environ
.
get
(
"
ARKINDEX_PROCESS_ID
"
),
"
ARKINDEX_PROCESS_ID environment variable is not defined
"
self
.
process_information
=
self
.
request
(
"
RetrieveDataImport
"
,
id
=
os
.
environ
[
"
ARKINDEX_PROCESS_ID
"
]
)
if
self
.
worker_version_id
:
# Retrieve initial configuration from API
...
...
This diff is collapsed.
Click to expand it.
tests/test_elements_worker/test_worker.py
+
1
−
1
View file @
e0c32a44
...
...
@@ -99,7 +99,7 @@ def test_activities_disabled(responses, monkeypatch, mock_worker_version_api):
]
==
BASE_API_CALLS
def
test_activities_dev_mode
(
mocker
,
mock_worker_version_api
):
def
test_activities_dev_mode
(
mocker
):
"""
Worker activities are not stored in dev mode
"""
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment