Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Backend threading to avoid commit conflicts (+ website updates) #243

Merged
merged 6 commits into from
Dec 23, 2023
Merged

Backend threading to avoid commit conflicts (+ website updates) #243

merged 6 commits into from
Dec 23, 2023

Conversation

jannisborn
Copy link
Owner

INFO:main:======Location differ joblog from 2023-12-21 22:30:04=======
INFO:googlemaps.client:API queries_quota: 60
ERROR:pennyme.pennycollector:Geolocation failed for: Unknown Location sub: , Arco
INFO:main:Boot Hill Museum is available again
INFO:main:Location Kansas (45/125): Changes in 1/46 machines found.
INFO:main:
Result: 1 changes, 1 new machines found and 0 machines retired
ERROR:main:Found 5 problems that require manual intervention
INFO:main:======Location differ completed at 2023-12-22 00:19:35=======

@jannisborn jannisborn added bot PR created by a bot data Machine location updates labels Dec 21, 2023
@NinaWie
Copy link
Collaborator

NinaWie commented Dec 22, 2023

New machine 7011 named Candy Edcentures submitted.

@jannisborn
Copy link
Owner Author

INFO:main:======Location differ joblog from 2023-12-22 22:30:04=======
INFO:googlemaps.client:API queries_quota: 60
INFO:main:Dolly Parton's Stampede Dinner & Show is available again
INFO:main:134/177: Found machine to be added: Buc-ee's
INFO:main:Location Missouri (22/125): Changes in 2/177 machines found.
ERROR:pennyme.pennycollector:Geolocation failed for: Unknown Location sub: , Arco
INFO:main:68/90: Found machine to be added: Pillow's Funtrackers
INFO:main:Location New Mexico (40/125): Changes in 1/90 machines found.
INFO:main:
Result: 3 changes, 3 new machines found and 0 machines retired
ERROR:main:Found 5 problems that require manual intervention
INFO:main:======Location differ completed at 2023-12-23 00:19:20=======

@jannisborn jannisborn changed the title Updates from website (server_locations) Backend threading to avoid commit conflicts (+ website updates) Dec 23, 2023
NinaWie
NinaWie reviewed Dec 23, 2023
View reviewed changes
backend/app.py

# Upload the image
if "image" not in request.files:
return "No image file", 400
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not executed anymore, but I think it's okay since we already check in the frontend whether there is an image

NinaWie
NinaWie approved these changes Dec 23, 2023
View reviewed changes
Copy link
Collaborator

@NinaWie NinaWie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the threading changes! Looks good to me. I added two email changes.

@NinaWie NinaWie merged commit 3f85b7e into main Dec 23, 2023
1 check passed
@NinaWie NinaWie deleted the machine_updates branch December 23, 2023 08:12
@jannisborn jannisborn mentioned this pull request Dec 23, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NinaWie NinaWie NinaWie approved these changes

Assignees
No one assigned
Labels
bot PR created by a bot data Machine location updates
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jannisborn @NinaWie