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.

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

fix: re-enable flask multi-threading #94

Merged
merged 1 commit into from
Nov 8, 2022

Conversation

ShootingKing-AM
Copy link
Contributor

@ShootingKing-AM
Copy link
Contributor Author

@ErikBjare meow?

@ErikBjare
Copy link
Member

I'm worried this might have unintended side-effects (cause race-conditions in heartbeats etc), so a bit hesitant to merge this.

Hopefully some test would fail if that's the case, but for some reason it seems that CI hasn't run on this PR?

@ShootingKing-AM
Copy link
Contributor Author

It seems to be waiting for approval, you can also re run workflow manually

@ErikBjare
Copy link
Member

Must've been some bug in the GitHub mobile UI, approved now :)

@codecov
Copy link

codecov bot commented Nov 8, 2022

Codecov Report

Base: 55.93% // Head: 55.93% // No change to project coverage 👍

Coverage data is based on head (68f8d6c) compared to base (c12f912).
Patch has no changes to coverable lines.

Additional details and impacted files
@@           Coverage Diff           @@
##           master      #94   +/-   ##
=======================================
  Coverage   55.93%   55.93%           
=======================================
  Files          11       11           
  Lines         615      615           
=======================================
  Hits          344      344           
  Misses        271      271           
Impacted Files Coverage Δ
aw_server/server.py 82.45% <ø> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@ErikBjare
Copy link
Member

Alright, merged #95 so now I'm less worried about thread safety.

Merging :)

@ErikBjare ErikBjare changed the title [Fix] Re-enable Flask's multi-threading fix: re-enable flask multi-threading Nov 8, 2022
@ErikBjare ErikBjare merged commit a012e7a into ActivityWatch:master Nov 8, 2022
@ShootingKing-AM ShootingKing-AM deleted the patch-1 branch November 8, 2022 18:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants