Skip to content

Commit

Permalink
See CHANGELOG tag-2.4-20210907
Browse files Browse the repository at this point in the history
  • Loading branch information
jpnavarro committed Sep 8, 2021
1 parent 2587b97 commit 1296565
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
tag-2.4-20210907
- Dont' use update_or_create for EntityHistory which is always a new object

tag-2.4-20210906
- Deconfigure API logging rotation, we'll try letting Apache handle it

tag-2.4-20210905
- Correctly implment update_or_create
- Correctly implement update_or_create

tag-2.4-20210904
- Convert warehouse-views/v1/resource/ResourceID/ to APIResponse
Expand Down
2 changes: 1 addition & 1 deletion django_xsede_warehouse/glue2_provider/process.py
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,7 @@ def process(self, ts, doctype, resourceid, rawdata):

model = None
try:
model, created = EntityHistory.objects.update_or_create(DocumentType=doctype, ResourceID=resourceid, ReceivedTime=ts, EntityJSON=jsondata)
model = EntityHistory(DocumentType=doctype, ResourceID=resourceid, ReceivedTime=ts, EntityJSON=jsondata)
model.save()
logg2.info('New GLUE2 EntityHistory.ID={} (DocType={}, ResourceID={})'.format(model.ID, model.DocumentType, model.ResourceID))
self.EntityHistory_ID = model.ID
Expand Down

0 comments on commit 1296565

Please sign in to comment.