Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
agkyra
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
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
itminedu
agkyra
Commits
a05a9215
Commit
a05a9215
authored
9 years ago
by
Giorgos Korfiatis
Browse files
Options
Downloads
Patches
Plain Diff
Use kamaki 0.13.5 to fix ssl issue
parent
41998bb0
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
agkyra/syncer/setup.py
+0
-14
0 additions, 14 deletions
agkyra/syncer/setup.py
setup.py
+1
-1
1 addition, 1 deletion
setup.py
with
1 addition
and
15 deletions
agkyra/syncer/setup.py
+
0
−
14
View file @
a05a9215
...
@@ -32,9 +32,6 @@ from kamaki.clients.astakos import AstakosClient
...
@@ -32,9 +32,6 @@ from kamaki.clients.astakos import AstakosClient
from
kamaki.clients.pithos
import
PithosClient
from
kamaki.clients.pithos
import
PithosClient
from
kamaki.clients.utils
import
https
from
kamaki.clients.utils
import
https
# this will be deleted when kamaki 0.13.5 is out
from
kamaki.clients.astakos
import
AstakosClientError
logger
=
logging
.
getLogger
(
__name__
)
logger
=
logging
.
getLogger
(
__name__
)
...
@@ -80,17 +77,6 @@ def ssl_fall_back(method):
...
@@ -80,17 +77,6 @@ def ssl_fall_back(method):
'
Kamaki SSL failed, fall back to certifi (mozilla certs)
'
)
'
Kamaki SSL failed, fall back to certifi (mozilla certs)
'
)
https
.
patch_with_certs
(
os
.
path
.
join
(
RESOURCES
,
'
cacert.pem
'
))
https
.
patch_with_certs
(
os
.
path
.
join
(
RESOURCES
,
'
cacert.pem
'
))
return
method
(
self
,
*
args
,
**
kwargs
)
return
method
(
self
,
*
args
,
**
kwargs
)
# this will be deleted when kamaki 0.13.5 is out
except
AstakosClientError
as
ace
:
logger
.
debug
(
'
Kamaki failed with error %s
'
%
ace
)
if
'
[Errno 2]
'
in
ace
.
message
:
logger
.
info
(
'
Kamaki SSL failed with AstakosClientError [Errno 2],
'
'
fall back to certifi (mozilla certs)
'
)
https
.
patch_with_certs
(
os
.
path
.
join
(
RESOURCES
,
'
cacert.pem
'
))
return
method
(
self
,
*
args
,
**
kwargs
)
else
:
raise
return
wrap
return
wrap
...
...
This diff is collapsed.
Click to expand it.
setup.py
+
1
−
1
View file @
a05a9215
...
@@ -36,7 +36,7 @@ CLASSIFIERS = []
...
@@ -36,7 +36,7 @@ CLASSIFIERS = []
# Package requirements
# Package requirements
INSTALL_REQUIRES
=
[
INSTALL_REQUIRES
=
[
'
kamaki>=0.13.
4
'
,
'
kamaki>=0.13.
5
'
,
'
watchdog
'
,
'
watchdog
'
,
'
psutil
'
,
'
psutil
'
,
'
ws4py
'
,
'
ws4py
'
,
...
...
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