Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
N
network
Manage
Activity
Members
Labels
Plan
Issues
4
Issue boards
Milestones
Wiki
Code
Merge requests
9
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
funkwhale
network
Commits
a53f6227
Verified
Commit
a53f6227
authored
2 years ago
by
Georg Krause
Browse files
Options
Downloads
Patches
Plain Diff
feat: Allow to send logs to sentry
parent
a235fafd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#26327
passed with stages
in 8 minutes and 13 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
funkwhale_network/server.py
+18
-1
18 additions, 1 deletion
funkwhale_network/server.py
poetry.lock
+67
-3
67 additions, 3 deletions
poetry.lock
pyproject.toml
+1
-0
1 addition, 0 deletions
pyproject.toml
with
86 additions
and
4 deletions
funkwhale_network/server.py
+
18
−
1
View file @
a53f6227
from
.
import
routes
from
.
import
worker
from
.
import
settings
from
aiohttp
import
web
import
sentry_sdk
from
sentry_sdk.integrations.aiohttp
import
AioHttpIntegration
import
environ
def
prepare_app
(
app
,
pool
):
...
...
@@ -19,10 +21,25 @@ async def on_shutdown(app):
await
app
[
"
pool
"
].
wait_closed
()
def
initialize_sentry
():
dsn
=
environ
.
Env
()(
"
FUNKWHALE_NETWORK_DSN
"
,
default
=
None
)
if
dsn
==
None
:
print
(
"
Sentry is not configured, skipping
"
)
return
sentry_sdk
.
init
(
dsn
=
""
,
integrations
=
[
AioHttpIntegration
(),
],
traces_sample_rate
=
1.0
,
)
def
start
(
port
=
None
):
app
=
web
.
Application
(
middlewares
=
settings
.
MIDDLEWARES
)
prepare_app
(
app
,
None
)
app
.
on_shutdown
.
append
(
on_shutdown
)
initialize_sentry
()
web
.
run_app
(
app
,
port
=
port
)
...
...
This diff is collapsed.
Click to expand it.
poetry.lock
+
67
−
3
View file @
a53f6227
...
...
@@ -146,6 +146,14 @@ category = "dev"
optional
=
false
python-versions
=
"*"
[[
package
]]
name
=
"certifi"
version
=
"2022.9.24"
description
=
"Python package for providing Mozilla's CA Bundle."
category
=
"main"
optional
=
false
python-versions
=
">
=
3.6
"
[[
package
]]
name
=
"charset-normalizer"
version
=
"2.1.1"
...
...
@@ -607,6 +615,39 @@ category = "main"
optional
=
false
python-versions
=
">
=
2.7
,
!
=
3.0
.*
,
!
=
3.1
.*
,
!
=
3.2
.*
,
!
=
3.3
.*
"
[[
package
]]
name
=
"sentry-sdk"
version
=
"1.11.1"
description
=
"Python client for Sentry (https://sentry.io)"
category
=
"main"
optional
=
false
python-versions
=
"*"
[
package.dependencies
]
certifi
=
"*"
urllib3
=
{
version
=
">
=
1.26
.
11
", markers = "
python_version
>
=
\"
3.6
\"
"}
[
package.extras
]
aiohttp
=
[
"aiohttp (>=3.5)"
]
beam
=
[
"apache-beam (>=2.12)"
]
bottle
=
[
"bottle (>=0.12.13)"
]
celery
=
[
"celery (>=3)"
]
chalice
=
[
"chalice (>=1.16.0)"
]
django
=
[
"django (>=1.8)"
]
falcon
=
[
"falcon (>=1.4)"
]
fastapi
=
[
"fastapi (>=0.79.0)"
]
flask
=
[
"blinker (>=1.1)"
,
"flask (>=0.11)"
]
httpx
=
[
"httpx (>=0.16.0)"
]
pure-eval
=
[
"asttokens"
,
"executing"
,
"pure-eval"
]
pymongo
=
[
"pymongo (>=3.1)"
]
pyspark
=
[
"pyspark (>=2.4.4)"
]
quart
=
[
"blinker (>=1.1)"
,
"quart (>=0.16.1)"
]
rq
=
[
"rq (>=0.6)"
]
sanic
=
[
"sanic (>=0.8)"
]
sqlalchemy
=
[
"sqlalchemy (>=1.2)"
]
starlette
=
[
"starlette (>=0.19.1)"
]
tornado
=
[
"tornado (>=5)"
]
[[
package
]]
name
=
"setuptools"
version
=
"65.6.3"
...
...
@@ -691,6 +732,19 @@ category = "main"
optional
=
false
python-versions
=
">
=
3.7
"
[[
package
]]
name
=
"urllib3"
version
=
"1.26.13"
description
=
"HTTP library with thread-safe connection pooling, file post, and more."
category
=
"main"
optional
=
false
python-versions
=
">
=
2.7
,
!
=
3.0
.*
,
!
=
3.1
.*
,
!
=
3.2
.*
,
!
=
3.3
.*
,
!
=
3.4
.*
,
!
=
3.5
.*
"
[
package.extras
]
brotli
=
[
"brotli (>=1.0.9)"
,
"brotlicffi (>=0.8.0)"
,
"brotlipy (>=0.6.0)"
]
secure
=
[
"certifi"
,
"cryptography (>=1.3.4)"
,
"idna (>=2.0.0)"
,
"ipaddress"
,
"pyOpenSSL (>=0.14)"
,
"urllib3-secure-extra"
]
socks
=
[
"PySocks (>=1.5.6,!=1.5.7,<2.0)"
]
[[
package
]]
name
=
"wcwidth"
version
=
"0.2.5"
...
...
@@ -733,7 +787,7 @@ multidict = ">=4.0"
[
metadata
]
lock-version
=
"1.1"
python-versions
=
">
=
3.9
,
<
4.0
"
content-hash
=
"
2c51a57e9d54acb812f1385c0279a61ece6e73245c623948fa0daecc4831a1d4
"
content-hash
=
"
503c38dcb378688a84617c834856593b5a727d0c11d507972306728411918236
"
[
metadata.files
]
aiohttp
=
[
...
...
@@ -869,6 +923,10 @@ backcall = [
{file
=
"backcall-0.2.0-py2.py3-none-any.whl"
,
hash
=
"sha256:fbbce6a29f263178a1f7915c1940bde0ec2b2a967566fe1c65c1dfb7422bd255"
}
,
{file
=
"backcall-0.2.0.tar.gz"
,
hash
=
"sha256:5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e"
}
,
]
certifi
=
[
{file
=
"certifi-2022.9.24-py3-none-any.whl"
,
hash
=
"sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"
}
,
{file
=
"certifi-2022.9.24.tar.gz"
,
hash
=
"sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14"
}
,
]
charset-normalizer
=
[
{file
=
"charset-normalizer-2.1.1.tar.gz"
,
hash
=
"sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"
}
,
{file
=
"charset_normalizer-2.1.1-py3-none-any.whl"
,
hash
=
"sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"
}
,
...
...
@@ -1191,8 +1249,6 @@ prompt-toolkit = [
psycopg2
=
[
{file
=
"psycopg2-2.9.5-cp310-cp310-win32.whl"
,
hash
=
"sha256:d3ef67e630b0de0779c42912fe2cbae3805ebaba30cda27fea2a3de650a9414f"
}
,
{file
=
"psycopg2-2.9.5-cp310-cp310-win_amd64.whl"
,
hash
=
"sha256:4cb9936316d88bfab614666eb9e32995e794ed0f8f6b3b718666c22819c1d7ee"
}
,
{file
=
"psycopg2-2.9.5-cp311-cp311-win32.whl"
,
hash
=
"sha256:093e3894d2d3c592ab0945d9eba9d139c139664dcf83a1c440b8a7aa9bb21955"
}
,
{file
=
"psycopg2-2.9.5-cp311-cp311-win_amd64.whl"
,
hash
=
"sha256:920bf418000dd17669d2904472efeab2b20546efd0548139618f8fa305d1d7ad"
}
,
{file
=
"psycopg2-2.9.5-cp36-cp36m-win32.whl"
,
hash
=
"sha256:b9ac1b0d8ecc49e05e4e182694f418d27f3aedcfca854ebd6c05bb1cffa10d6d"
}
,
{file
=
"psycopg2-2.9.5-cp36-cp36m-win_amd64.whl"
,
hash
=
"sha256:fc04dd5189b90d825509caa510f20d1d504761e78b8dfb95a0ede180f71d50e5"
}
,
{file
=
"psycopg2-2.9.5-cp37-cp37m-win32.whl"
,
hash
=
"sha256:922cc5f0b98a5f2b1ff481f5551b95cd04580fd6f0c72d9b22e6c0145a4840e0"
}
,
...
...
@@ -1319,6 +1375,10 @@ semver = [
{file
=
"semver-2.13.0-py2.py3-none-any.whl"
,
hash
=
"sha256:ced8b23dceb22134307c1b8abfa523da14198793d9787ac838e70e29e77458d4"
}
,
{file
=
"semver-2.13.0.tar.gz"
,
hash
=
"sha256:fa0fe2722ee1c3f57eac478820c3a5ae2f624af8264cbdf9000c980ff7f75e3f"
}
,
]
sentry-sdk
=
[
{file
=
"sentry-sdk-1.11.1.tar.gz"
,
hash
=
"sha256:675f6279b6bb1fea09fd61751061f9a90dca3b5929ef631dd50dc8b3aeb245e9"
}
,
{file
=
"sentry_sdk-1.11.1-py2.py3-none-any.whl"
,
hash
=
"sha256:8b4ff696c0bdcceb3f70bbb87a57ba84fd3168b1332d493fcd16c137f709578c"
}
,
]
setuptools
=
[
{file
=
"setuptools-65.6.3-py3-none-any.whl"
,
hash
=
"sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54"
}
,
{file
=
"setuptools-65.6.3.tar.gz"
,
hash
=
"sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75"
}
,
...
...
@@ -1351,6 +1411,10 @@ typing-extensions = [
{file
=
"typing_extensions-4.4.0-py3-none-any.whl"
,
hash
=
"sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e"
}
,
{file
=
"typing_extensions-4.4.0.tar.gz"
,
hash
=
"sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa"
}
,
]
urllib3
=
[
{file
=
"urllib3-1.26.13-py2.py3-none-any.whl"
,
hash
=
"sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc"
}
,
{file
=
"urllib3-1.26.13.tar.gz"
,
hash
=
"sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"
}
,
]
wcwidth
=
[
{file
=
"wcwidth-0.2.5-py2.py3-none-any.whl"
,
hash
=
"sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"
}
,
{file
=
"wcwidth-0.2.5.tar.gz"
,
hash
=
"sha256:c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83"
}
,
...
...
This diff is collapsed.
Click to expand it.
pyproject.toml
+
1
−
0
View file @
a53f6227
...
...
@@ -18,6 +18,7 @@ webargs = "8.2.0"
tabulate
=
"0.9.0"
arq
=
"0.24.0"
psycopg2
=
"2.9.5"
sentry-sdk
=
"^1.11.1"
[tool.poetry.dev-dependencies]
ipdb
=
"^0.13.9"
...
...
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