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
97064db2
Commit
97064db2
authored
Jan 23, 2019
by
Ozzieisaacs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Restart python3 fix, stop and restart python2 working again
parent
341dd77b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
4 deletions
+14
-4
server.py
cps/server.py
+10
-2
updater.py
cps/updater.py
+2
-2
web.py
cps/web.py
+2
-0
No files found.
cps/server.py
View file @
97064db2
...
@@ -25,7 +25,7 @@ import signal
...
@@ -25,7 +25,7 @@ import signal
import
web
import
web
try
:
try
:
from
gevent.p
y
wsgi
import
WSGIServer
from
gevent.p
i
wsgi
import
WSGIServer
from
gevent.pool
import
Pool
from
gevent.pool
import
Pool
from
gevent
import
__version__
as
geventVersion
from
gevent
import
__version__
as
geventVersion
gevent_present
=
True
gevent_present
=
True
...
@@ -37,6 +37,7 @@ except ImportError:
...
@@ -37,6 +37,7 @@ except ImportError:
gevent_present
=
False
gevent_present
=
False
class
server
:
class
server
:
wsgiserver
=
None
wsgiserver
=
None
...
@@ -63,6 +64,7 @@ class server:
...
@@ -63,6 +64,7 @@ class server:
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
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...'
)
...
@@ -110,6 +112,9 @@ class server:
...
@@ -110,6 +112,9 @@ class server:
web
.
helper
.
global_WorkerThread
.
stop
()
web
.
helper
.
global_WorkerThread
.
stop
()
sys
.
exit
(
1
)
sys
.
exit
(
1
)
# ToDo: Somehow caused by circular import under python3 refactor
if
sys
.
version_info
>
(
3
,
0
):
self
.
restart
=
web
.
py3_restart_Typ
if
self
.
restart
==
True
:
if
self
.
restart
==
True
:
web
.
app
.
logger
.
info
(
"Performing restart of Calibre-Web"
)
web
.
app
.
logger
.
info
(
"Performing restart of Calibre-Web"
)
web
.
helper
.
global_WorkerThread
.
stop
()
web
.
helper
.
global_WorkerThread
.
stop
()
...
@@ -126,12 +131,15 @@ class server:
...
@@ -126,12 +131,15 @@ class server:
sys
.
exit
(
0
)
sys
.
exit
(
0
)
def
setRestartTyp
(
self
,
starttyp
):
def
setRestartTyp
(
self
,
starttyp
):
self
.
restart
=
starttyp
self
.
restart
=
starttyp
# ToDo: Somehow caused by circular import under python3 refactor
web
.
py3_restart_Typ
=
starttyp
def
killServer
(
self
,
signum
,
frame
):
def
killServer
(
self
,
signum
,
frame
):
self
.
stopServer
()
self
.
stopServer
()
def
stopServer
(
self
):
def
stopServer
(
self
):
# ToDo: Somehow caused by circular import under python3 refactor
if
sys
.
version_info
>
(
3
,
0
):
if
sys
.
version_info
>
(
3
,
0
):
if
not
self
.
wsgiserver
:
if
not
self
.
wsgiserver
:
if
gevent_present
:
if
gevent_present
:
...
...
cps/updater.py
View file @
97064db2
...
@@ -216,7 +216,7 @@ class Updater(threading.Thread):
...
@@ -216,7 +216,7 @@ class Updater(threading.Thread):
item_path
=
os
.
path
.
join
(
destination
,
item
[
1
:])
item_path
=
os
.
path
.
join
(
destination
,
item
[
1
:])
if
os
.
path
.
isdir
(
item_path
):
if
os
.
path
.
isdir
(
item_path
):
logging
.
getLogger
(
'cps.web'
)
.
debug
(
"Delete dir "
+
item_path
)
logging
.
getLogger
(
'cps.web'
)
.
debug
(
"Delete dir "
+
item_path
)
shutil
.
rmtree
(
item_path
)
shutil
.
rmtree
(
item_path
,
ignore_errors
=
True
)
else
:
else
:
try
:
try
:
logging
.
getLogger
(
'cps.web'
)
.
debug
(
"Delete file "
+
item_path
)
logging
.
getLogger
(
'cps.web'
)
.
debug
(
"Delete file "
+
item_path
)
...
@@ -237,7 +237,7 @@ class Updater(threading.Thread):
...
@@ -237,7 +237,7 @@ class Updater(threading.Thread):
return
False
return
False
def
_stable_version_info
(
self
):
def
_stable_version_info
(
self
):
return
{
'version'
:
'0.6.0'
}
return
{
'version'
:
'0.6.0'
}
# Current version
def
_nightly_available_updates
(
self
,
request_method
):
def
_nightly_available_updates
(
self
,
request_method
):
tz
=
datetime
.
timedelta
(
seconds
=
time
.
timezone
if
(
time
.
localtime
()
.
tm_isdst
==
0
)
else
time
.
altzone
)
tz
=
datetime
.
timedelta
(
seconds
=
time
.
timezone
if
(
time
.
localtime
()
.
tm_isdst
==
0
)
else
time
.
altzone
)
...
...
cps/web.py
View file @
97064db2
...
@@ -132,7 +132,9 @@ except ImportError:
...
@@ -132,7 +132,9 @@ 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'
# ToDo: Somehow caused by circular import under python3 refactor
py3_gevent_link
=
None
py3_gevent_link
=
None
py3_restart_Typ
=
False
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