Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
coco
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
ops
coco
Commits
6467a8f9
Commit
6467a8f9
authored
Mar 02, 2018
by
zheng liu
Browse files
Options
Browse Files
Download
Plain Diff
Merged in dev (pull request #25)
feat: did not fix the bug...
parents
7c7df183
38d476a0
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
+2
-6
httpd.py
coco/httpd.py
+1
-6
recorder.py
coco/recorder.py
+1
-0
No files found.
coco/httpd.py
View file @
6467a8f9
...
@@ -64,7 +64,6 @@ class ProxyNamespace(BaseNamespace):
...
@@ -64,7 +64,6 @@ class ProxyNamespace(BaseNamespace):
"room"
:
room
,
"room"
:
room
,
"proxy"
:
dict
(),
"proxy"
:
dict
(),
"client"
:
dict
(),
"client"
:
dict
(),
"thread"
:
dict
(),
"forwarder"
:
dict
(),
"forwarder"
:
dict
(),
"request"
:
self
.
make_coco_request
()
"request"
:
self
.
make_coco_request
()
}
}
...
@@ -152,7 +151,7 @@ class ProxyNamespace(BaseNamespace):
...
@@ -152,7 +151,7 @@ class ProxyNamespace(BaseNamespace):
self
.
clients
[
request
.
sid
][
"forwarder"
][
connection
]
=
ProxyServer
(
self
.
clients
[
request
.
sid
][
"forwarder"
][
connection
]
=
ProxyServer
(
self
.
app
,
self
.
clients
[
request
.
sid
][
"client"
][
connection
]
self
.
app
,
self
.
clients
[
request
.
sid
][
"client"
][
connection
]
)
)
self
.
clients
[
request
.
sid
][
"thread"
][
connection
]
=
self
.
socketio
.
start_background_task
(
self
.
socketio
.
start_background_task
(
self
.
clients
[
request
.
sid
][
"forwarder"
][
connection
]
.
proxy
,
self
.
clients
[
request
.
sid
][
"forwarder"
][
connection
]
.
proxy
,
asset
,
system_user
asset
,
system_user
)
)
...
@@ -232,9 +231,6 @@ class ProxyNamespace(BaseNamespace):
...
@@ -232,9 +231,6 @@ class ProxyNamespace(BaseNamespace):
del
self
.
clients
[
request
.
sid
][
"forwarder"
][
connection
]
del
self
.
clients
[
request
.
sid
][
"forwarder"
][
connection
]
if
connection
in
self
.
clients
[
request
.
sid
][
"client"
]
.
keys
():
if
connection
in
self
.
clients
[
request
.
sid
][
"client"
]
.
keys
():
del
self
.
clients
[
request
.
sid
][
"client"
][
connection
]
del
self
.
clients
[
request
.
sid
][
"client"
][
connection
]
if
connection
in
self
.
clients
[
request
.
sid
][
"thread"
]
.
keys
():
logger
.
debug
(
"thread close"
,
connection
)
self
.
clients
[
request
.
sid
][
"thread"
][
connection
]
.
stop
()
class
HttpServer
:
class
HttpServer
:
...
@@ -261,7 +257,6 @@ class HttpServer:
...
@@ -261,7 +257,6 @@ class HttpServer:
def
run
(
self
):
def
run
(
self
):
host
=
self
.
flask_app
.
config
[
"BIND_HOST"
]
host
=
self
.
flask_app
.
config
[
"BIND_HOST"
]
port
=
self
.
flask_app
.
config
[
"HTTPD_PORT"
]
port
=
self
.
flask_app
.
config
[
"HTTPD_PORT"
]
print
(
'Starting websocket server at {}:{}'
.
format
(
host
,
port
))
self
.
socket_io
.
init_app
(
self
.
flask_app
,
async_mode
=
self
.
async_mode
)
self
.
socket_io
.
init_app
(
self
.
flask_app
,
async_mode
=
self
.
async_mode
)
self
.
socket_io
.
run
(
self
.
flask_app
,
port
=
port
,
host
=
host
,
debug
=
False
)
self
.
socket_io
.
run
(
self
.
flask_app
,
port
=
port
,
host
=
host
,
debug
=
False
)
...
...
coco/recorder.py
View file @
6467a8f9
...
@@ -255,6 +255,7 @@ class S3ReplayRecorder(ServerReplayRecorder):
...
@@ -255,6 +255,7 @@ class S3ReplayRecorder(ServerReplayRecorder):
self
.
s3
=
boto3
.
client
(
's3'
)
self
.
s3
=
boto3
.
client
(
's3'
)
def
push_to_server
(
self
,
session_id
):
def
push_to_server
(
self
,
session_id
):
logger
.
debug
(
"push to server"
)
try
:
try
:
self
.
s3
.
upload_file
(
self
.
s3
.
upload_file
(
os
.
path
.
join
(
self
.
app
.
config
[
'LOG_DIR'
],
session_id
+
'.replay.gz'
),
os
.
path
.
join
(
self
.
app
.
config
[
'LOG_DIR'
],
session_id
+
'.replay.gz'
),
...
...
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