Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
srvpro
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
srvpro
Commits
aff9472e
Commit
aff9472e
authored
Jun 13, 2016
by
mercury233
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update stderr log
parent
d024444c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
9 deletions
+24
-9
ygopro-server.coffee
ygopro-server.coffee
+9
-4
ygopro-server.js
ygopro-server.js
+15
-5
No files found.
ygopro-server.coffee
View file @
aff9472e
...
...
@@ -417,7 +417,10 @@ class Room
return
return
@
process
.
stderr
.
on
'data'
,
(
data
)
=>
log
.
info
"YGOPRO stderr: "
+
data
data
=
"Debug: "
+
data
data
=
data
.
replace
(
/\n$/
,
""
)
log
.
info
"YGOPRO "
+
data
ygopro
.
stoc_send_chat_to_room
this
,
data
,
ygopro
.
constants
.
COLORS
.
RED
@
has_ygopro_error
=
true
return
catch
...
...
@@ -426,6 +429,8 @@ class Room
return
if
@
deleted
#log.info 'room-delete', this.name, ROOM_all.length
if
@
player_datas
.
length
and
settings
.
modules
.
enable_cloud_replay
if
@
has_ygopro_error
log_rep_id
=
true
player_names
=
@
player_datas
[
0
].
name
+
(
if
@
player_datas
[
2
]
then
"+"
+
@
player_datas
[
2
].
name
else
""
)
+
" VS "
+
(
if
@
player_datas
[
1
]
then
@
player_datas
[
1
].
name
else
"AI"
)
+
...
...
@@ -452,7 +457,7 @@ class Room
recorded_ip
.
push
player_ip
redisdb
.
lpush
(
player_ip
+
":replays"
,
replay_id
)
return
if
@
has_ygopro_error
if
log_rep_id
log
.
info
"error replay: R#"
+
replay_id
return
@
watcher_buffers
=
[]
...
...
@@ -738,7 +743,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)->
_
.
each
result
,
(
replay_id
,
id
)
->
redisdb
.
hgetall
"replay:"
+
replay_id
,
(
err
,
replay
)
->
if
err
or
!
replay
log
.
info
"cloud replay getall error: "
+
err
log
.
info
"cloud replay getall error: "
+
err
if
err
return
ygopro
.
stoc_send_chat
(
client
,
"<
#{
id
-
0
+
1
}
> R#
#{
replay_id
}
#{
replay
.
player_names
}
#{
replay
.
date_time
}
"
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
)
return
...
...
@@ -758,7 +763,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)->
if
(
replay_id
>
0
and
replay_id
<=
9
)
redisdb
.
lindex
client
.
remoteAddress
+
":replays"
,
replay_id
-
1
,
(
err
,
replay_id
)
->
if
err
or
!
replay_id
log
.
info
"cloud replay replayid error: "
+
err
log
.
info
"cloud replay replayid error: "
+
err
if
err
ygopro
.
stoc_die
(
client
,
"没有找到录像"
)
return
redisdb
.
hgetall
"replay:"
+
replay_id
,
client
.
open_cloud_replay
...
...
ygopro-server.js
View file @
aff9472e
...
...
@@ -558,7 +558,10 @@
})(
this
));
this
.
process
.
stderr
.
on
(
'
data
'
,
(
function
(
_this
)
{
return
function
(
data
)
{
log
.
info
(
"
YGOPRO stderr:
"
+
data
);
data
=
"
Debug:
"
+
data
;
data
=
data
.
replace
(
/
\n
$/
,
""
);
log
.
info
(
"
YGOPRO
"
+
data
);
ygopro
.
stoc_send_chat_to_room
(
_this
,
data
,
ygopro
.
constants
.
COLORS
.
RED
);
_this
.
has_ygopro_error
=
true
;
};
})(
this
));
...
...
@@ -568,11 +571,14 @@
}
Room
.
prototype
[
"
delete
"
]
=
function
()
{
var
index
,
player_ips
,
player_names
,
recorder_buffer
;
var
index
,
log_rep_id
,
player_ips
,
player_names
,
recorder_buffer
;
if
(
this
.
deleted
)
{
return
;
}
if
(
this
.
player_datas
.
length
&&
settings
.
modules
.
enable_cloud_replay
)
{
if
(
this
.
has_ygopro_error
)
{
log_rep_id
=
true
;
}
player_names
=
this
.
player_datas
[
0
].
name
+
(
this
.
player_datas
[
2
]
?
"
+
"
+
this
.
player_datas
[
2
].
name
:
""
)
+
"
VS
"
+
(
this
.
player_datas
[
1
]
?
this
.
player_datas
[
1
].
name
:
"
AI
"
)
+
(
this
.
player_datas
[
3
]
?
"
+
"
+
this
.
player_datas
[
3
].
name
:
""
);
player_ips
=
[];
_
.
each
(
this
.
player_datas
,
function
(
player
)
{
...
...
@@ -594,7 +600,7 @@
recorded_ip
.
push
(
player_ip
);
redisdb
.
lpush
(
player_ip
+
"
:replays
"
,
replay_id
);
});
if
(
this
.
has_ygopro_error
)
{
if
(
log_rep_id
)
{
log
.
info
(
"
error replay: R#
"
+
replay_id
);
}
});
...
...
@@ -928,7 +934,9 @@
_
.
each
(
result
,
function
(
replay_id
,
id
)
{
redisdb
.
hgetall
(
"
replay:
"
+
replay_id
,
function
(
err
,
replay
)
{
if
(
err
||
!
replay
)
{
if
(
err
)
{
log
.
info
(
"
cloud replay getall error:
"
+
err
);
}
return
;
}
ygopro
.
stoc_send_chat
(
client
,
"
<
"
+
(
id
-
0
+
1
)
+
"
> R#
"
+
replay_id
+
"
"
+
replay
.
player_names
+
"
"
+
replay
.
date_time
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
);
...
...
@@ -947,7 +955,9 @@
if
(
replay_id
>
0
&&
replay_id
<=
9
)
{
redisdb
.
lindex
(
client
.
remoteAddress
+
"
:replays
"
,
replay_id
-
1
,
function
(
err
,
replay_id
)
{
if
(
err
||
!
replay_id
)
{
if
(
err
)
{
log
.
info
(
"
cloud replay replayid error:
"
+
err
);
}
ygopro
.
stoc_die
(
client
,
"
没有找到录像
"
);
return
;
}
...
...
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