Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
douban-api-proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
captainwong
douban-api-proxy
Commits
341dd77b
Commit
341dd77b
authored
Jan 21, 2019
by
Ozzieisaacs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bugfix Restart and Stop server on python3
parent
836c6fd2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
0 deletions
+9
-0
server.py
cps/server.py
+8
-0
web.py
cps/web.py
+1
-0
No files found.
cps/server.py
View file @
341dd77b
...
@@ -61,11 +61,13 @@ class server:
...
@@ -61,11 +61,13 @@ class server:
self
.
wsgiserver
=
WSGIServer
((
'0.0.0.0'
,
web
.
ub
.
config
.
config_port
),
web
.
app
,
spawn
=
Pool
(),
**
ssl_args
)
self
.
wsgiserver
=
WSGIServer
((
'0.0.0.0'
,
web
.
ub
.
config
.
config_port
),
web
.
app
,
spawn
=
Pool
(),
**
ssl_args
)
else
:
else
:
self
.
wsgiserver
=
WSGIServer
((
''
,
web
.
ub
.
config
.
config_port
),
web
.
app
,
spawn
=
Pool
(),
**
ssl_args
)
self
.
wsgiserver
=
WSGIServer
((
''
,
web
.
ub
.
config
.
config_port
),
web
.
app
,
spawn
=
Pool
(),
**
ssl_args
)
web
.
py3_gevent_link
=
self
.
wsgiserver
self
.
wsgiserver
.
serve_forever
()
self
.
wsgiserver
.
serve_forever
()
except
SocketError
:
except
SocketError
:
try
:
try
:
web
.
app
.
logger
.
info
(
'Unable to listen on
\'\'
, trying on IPv4 only...'
)
web
.
app
.
logger
.
info
(
'Unable to listen on
\'\'
, trying on IPv4 only...'
)
self
.
wsgiserver
=
WSGIServer
((
'0.0.0.0'
,
web
.
ub
.
config
.
config_port
),
web
.
app
,
spawn
=
Pool
(),
**
ssl_args
)
self
.
wsgiserver
=
WSGIServer
((
'0.0.0.0'
,
web
.
ub
.
config
.
config_port
),
web
.
app
,
spawn
=
Pool
(),
**
ssl_args
)
web
.
py3_gevent_link
=
self
.
wsgiserver
self
.
wsgiserver
.
serve_forever
()
self
.
wsgiserver
.
serve_forever
()
except
(
OSError
,
SocketError
)
as
e
:
except
(
OSError
,
SocketError
)
as
e
:
web
.
app
.
logger
.
info
(
"Error starting server:
%
s"
%
e
.
strerror
)
web
.
app
.
logger
.
info
(
"Error starting server:
%
s"
%
e
.
strerror
)
...
@@ -130,6 +132,12 @@ class server:
...
@@ -130,6 +132,12 @@ class server:
self
.
stopServer
()
self
.
stopServer
()
def
stopServer
(
self
):
def
stopServer
(
self
):
if
sys
.
version_info
>
(
3
,
0
):
if
not
self
.
wsgiserver
:
if
gevent_present
:
self
.
wsgiserver
=
web
.
py3_gevent_link
else
:
self
.
wsgiserver
=
IOLoop
.
instance
()
if
self
.
wsgiserver
:
if
self
.
wsgiserver
:
if
gevent_present
:
if
gevent_present
:
self
.
wsgiserver
.
close
()
self
.
wsgiserver
.
close
()
...
...
cps/web.py
View file @
341dd77b
...
@@ -132,6 +132,7 @@ except ImportError:
...
@@ -132,6 +132,7 @@ except ImportError:
# Global variables
# Global variables
current_milli_time
=
lambda
:
int
(
round
(
time
.
time
()
*
1000
))
current_milli_time
=
lambda
:
int
(
round
(
time
.
time
()
*
1000
))
gdrive_watch_callback_token
=
'target=calibreweb-watch_files'
gdrive_watch_callback_token
=
'target=calibreweb-watch_files'
py3_gevent_link
=
None
EXTENSIONS_UPLOAD
=
{
'txt'
,
'pdf'
,
'epub'
,
'mobi'
,
'azw'
,
'azw3'
,
'cbr'
,
'cbz'
,
'cbt'
,
'djvu'
,
'prc'
,
'doc'
,
'docx'
,
EXTENSIONS_UPLOAD
=
{
'txt'
,
'pdf'
,
'epub'
,
'mobi'
,
'azw'
,
'azw3'
,
'cbr'
,
'cbz'
,
'cbt'
,
'djvu'
,
'prc'
,
'doc'
,
'docx'
,
'fb2'
,
'html'
,
'rtf'
,
'odt'
}
'fb2'
,
'html'
,
'rtf'
,
'odt'
}
EXTENSIONS_CONVERT
=
{
'pdf'
,
'epub'
,
'mobi'
,
'azw3'
,
'docx'
,
'rtf'
,
'fb2'
,
'lit'
,
'lrf'
,
'txt'
,
'htmlz'
}
EXTENSIONS_CONVERT
=
{
'pdf'
,
'epub'
,
'mobi'
,
'azw3'
,
'docx'
,
'rtf'
,
'fb2'
,
'lit'
,
'lrf'
,
'txt'
,
'htmlz'
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment