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
a2bd1205
Commit
a2bd1205
authored
Oct 18, 2016
by
mercury233
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update load users
parent
c0f441a9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
36 deletions
+31
-36
ygopro-server.coffee
ygopro-server.coffee
+15
-13
ygopro-server.js
ygopro-server.js
+16
-23
No files found.
ygopro-server.coffee
View file @
a2bd1205
...
...
@@ -107,6 +107,21 @@ roomlist = require './roomlist.js' if settings.modules.enable_websocket_roomlist
# cache users of mycard login
users_cache
=
{}
if
settings
.
modules
.
mycard_auth
and
process
.
env
.
MYCARD_AUTH_DATABASE
pgClient
=
require
(
'pg'
).
Client
pg_client
=
new
pgClient
(
process
.
env
.
MYCARD_AUTH_DATABASE
)
pg_query
=
pg_client
.
query
(
'SELECT username, id from users'
)
pg_query
.
on
'row'
,
(
row
)
->
#log.info "load user", row.username, row.id
users_cache
[
row
.
username
]
=
row
.
id
return
pg_query
.
on
'end'
,
(
result
)
->
log
.
info
"users loaded"
,
result
.
rowCount
return
pg_client
.
on
'drain'
,
pg_client
.
end
.
bind
(
pg_client
)
log
.
info
"loading mycard user..."
pg_client
.
connect
()
# 获取可用内存
get_memory_usage
=
()
->
prc_free
=
spawnSync
(
"free"
,
[])
...
...
@@ -1299,19 +1314,6 @@ if settings.modules.tips
return
,
30000
if
settings
.
modules
.
mycard_auth
and
process
.
env
.
MYCARD_AUTH_DATABASE
pg
=
require
(
'pg'
)
pg
.
connect
process
.
env
.
MYCARD_AUTH_DATABASE
,
(
error
,
client
,
done
)
->
throw
error
if
error
client
.
query
'SELECT username, id from users'
,
(
error
,
result
)
->
throw
error
if
error
done
()
for
row
in
result
.
rows
users_cache
[
row
.
username
]
=
row
.
id
console
.
log
(
"users loaded"
,
_
.
keys
(
users_cache
).
length
)
return
return
ygopro
.
stoc_follow
'DUEL_START'
,
false
,
(
buffer
,
info
,
client
,
server
)
->
room
=
ROOM_all
[
client
.
rid
]
return
unless
room
...
...
ygopro-server.js
View file @
a2bd1205
// Generated by CoffeeScript 1.10.0
(
function
()
{
var
Cloud_replay_ids
,
Graveyard
,
ROOM_all
,
ROOM_bad_ip
,
ROOM_ban_player
,
ROOM_connected_ip
,
ROOM_find_by_name
,
ROOM_find_by_port
,
ROOM_find_or_create_ai
,
ROOM_find_or_create_by_name
,
ROOM_find_or_create_random
,
ROOM_players_banned
,
ROOM_players_oppentlist
,
ROOM_validate
,
Room
,
_
,
ban_user
,
bunyan
,
crypto
,
date
,
defaultconfig
,
execFile
,
fs
,
get_memory_usage
,
http
,
http_server
,
https
,
https_server
,
list
,
load_dialogues
,
load_tips
,
log
,
moment
,
nconf
,
net
,
options
,
os
,
path
,
pg
,
redis
,
redisdb
,
request
,
requestListener
,
roomlist
,
settings
,
spawn
,
spawnSync
,
tribute
,
url
,
users_cache
,
wait_room_start
,
windbot_process
,
ygopro
,
zlib
;
var
Cloud_replay_ids
,
Graveyard
,
ROOM_all
,
ROOM_bad_ip
,
ROOM_ban_player
,
ROOM_connected_ip
,
ROOM_find_by_name
,
ROOM_find_by_port
,
ROOM_find_or_create_ai
,
ROOM_find_or_create_by_name
,
ROOM_find_or_create_random
,
ROOM_players_banned
,
ROOM_players_oppentlist
,
ROOM_validate
,
Room
,
_
,
ban_user
,
bunyan
,
crypto
,
date
,
defaultconfig
,
execFile
,
fs
,
get_memory_usage
,
http
,
http_server
,
https
,
https_server
,
list
,
load_dialogues
,
load_tips
,
log
,
moment
,
nconf
,
net
,
options
,
os
,
path
,
pg
Client
,
pg_client
,
pg_query
,
redis
,
redisdb
,
request
,
requestListener
,
roomlist
,
settings
,
spawn
,
spawnSync
,
tribute
,
url
,
users_cache
,
wait_room_start
,
windbot_process
,
ygopro
,
zlib
;
net
=
require
(
'
net
'
);
...
...
@@ -155,6 +155,21 @@
users_cache
=
{};
if
(
settings
.
modules
.
mycard_auth
&&
process
.
env
.
MYCARD_AUTH_DATABASE
)
{
pgClient
=
require
(
'
pg
'
).
Client
;
pg_client
=
new
pgClient
(
process
.
env
.
MYCARD_AUTH_DATABASE
);
pg_query
=
pg_client
.
query
(
'
SELECT username, id from users
'
);
pg_query
.
on
(
'
row
'
,
function
(
row
)
{
users_cache
[
row
.
username
]
=
row
.
id
;
});
pg_query
.
on
(
'
end
'
,
function
(
result
)
{
log
.
info
(
"
users loaded
"
,
result
.
rowCount
);
});
pg_client
.
on
(
'
drain
'
,
pg_client
.
end
.
bind
(
pg_client
));
log
.
info
(
"
loading mycard user...
"
);
pg_client
.
connect
();
}
get_memory_usage
=
function
()
{
var
actualFree
,
buffers
,
cached
,
free
,
line
,
lines
,
percentUsed
,
prc_free
,
total
;
prc_free
=
spawnSync
(
"
free
"
,
[]);
...
...
@@ -1587,28 +1602,6 @@
},
30000
);
}
if
(
settings
.
modules
.
mycard_auth
&&
process
.
env
.
MYCARD_AUTH_DATABASE
)
{
pg
=
require
(
'
pg
'
);
pg
.
connect
(
process
.
env
.
MYCARD_AUTH_DATABASE
,
function
(
error
,
client
,
done
)
{
if
(
error
)
{
throw
error
;
}
client
.
query
(
'
SELECT username, id from users
'
,
function
(
error
,
result
)
{
var
k
,
len
,
ref
,
row
;
if
(
error
)
{
throw
error
;
}
done
();
ref
=
result
.
rows
;
for
(
k
=
0
,
len
=
ref
.
length
;
k
<
len
;
k
++
)
{
row
=
ref
[
k
];
users_cache
[
row
.
username
]
=
row
.
id
;
}
console
.
log
(
"
users loaded
"
,
_
.
keys
(
users_cache
).
length
);
});
});
}
ygopro
.
stoc_follow
(
'
DUEL_START
'
,
false
,
function
(
buffer
,
info
,
client
,
server
)
{
var
deck_name
,
deck_text
,
k
,
len
,
player
,
ref
,
room
;
room
=
ROOM_all
[
client
.
rid
];
...
...
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