Skip to content
New issue

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

#

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

Already on GitHub? # to your account

[GitHib issue #1923] Scans not working #1924

Merged
merged 2 commits into from
Jul 13, 2021
Merged

[GitHib issue #1923] Scans not working #1924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ffdfcb
Update version values for release 7.2.0
Fizz11 Jul 12, 2021
b1a8b7f
moved job creation logic into the loop
Fizz11 Jul 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions scale/ingest/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,18 +318,18 @@ def start_ingest_tasks(self, ingests, scan_id=None, strike_id=None):
else:
raise Exception('One of scan_id or strike_id must be set')

data = Data()
data.add_value(JsonValue('ingest_id', ingest_id))
data.add_value(JsonValue('workspace', ingest.workspace.name))
if ingest.new_workspace:
data.add_value(JsonValue('new_workspace', ingest.new_workspace.name))

ingest_job = None
with transaction.atomic():
data = Data()
data.add_value(JsonValue('ingest_id', ingest_id))
data.add_value(JsonValue('workspace', ingest.workspace.name))
if ingest.new_workspace:
data.add_value(JsonValue('new_workspace', ingest.new_workspace.name))

ingest_job = None
ingest_job = Queue.objects.queue_new_job_v6(ingest_job_type, data, event)
ingest.job = ingest_job
ingest.status = 'QUEUED'
ingest.save()
with transaction.atomic():
ingest.job = ingest_job
ingest.status = 'QUEUED'
ingest.save()

logger.debug('Successfully created ingest task for %s', ingest.file_name)

Expand Down
2 changes: 1 addition & 1 deletion scale/scale/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
'version_info_t', ('major', 'minor', 'patch', 'qualifier'),
)

VERSION = version_info_t(7, 2, 0, '-snapshot')
VERSION = version_info_t(7, 2, 0, '')

__version__ = '{0.major}.{0.minor}.{0.patch}{0.qualifier}'.format(VERSION)

Expand Down
2 changes: 1 addition & 1 deletion scale/scale/__init__.py.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version_info_t = namedtuple(
'version_info_t', ('major', 'minor', 'patch', 'qualifier'),
)

VERSION = version_info_t(7, 2, 0, '-snapshot___BUILDNUM___')
VERSION = version_info_t(7, 2, 0, '___BUILDNUM___')

__version__ = '{0.major}.{0.minor}.{0.patch}{0.qualifier}'.format(VERSION)

Expand Down