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
d72e7a82
Commit
d72e7a82
authored
Jul 24, 2019
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more globals
parent
b95820df
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
10 deletions
+12
-10
ygopro-server.coffee
ygopro-server.coffee
+6
-5
ygopro-server.js
ygopro-server.js
+6
-5
No files found.
ygopro-server.coffee
View file @
d72e7a82
...
...
@@ -279,7 +279,7 @@ catch
if
settings
.
modules
.
cloud_replay
.
enabled
redis
=
require
'redis'
zlib
=
require
'zlib'
redisdb
=
redis
.
createClient
(
settings
.
modules
.
cloud_replay
.
redis
)
redisdb
=
global
.
redisdb
=
redis
.
createClient
(
settings
.
modules
.
cloud_replay
.
redis
)
redisdb
.
on
'error'
,
(
err
)
->
log
.
warn
err
return
...
...
@@ -293,6 +293,7 @@ if settings.modules.windbot.enabled
if
(
!
err
)
real_windbot_server_ip
=
addr
)
global
.
real_windbot_server_ip
=
real_windbot_server_ip
if
settings
.
modules
.
heartbeat_detection
.
enabled
...
...
@@ -310,7 +311,7 @@ users_cache = {}
if
settings
.
modules
.
mycard
.
enabled
pgClient
=
require
(
'pg'
).
Client
pg_client
=
new
pgClient
(
settings
.
modules
.
mycard
.
auth_database
)
pg_client
=
global
.
pg_client
=
new
pgClient
(
settings
.
modules
.
mycard
.
auth_database
)
pg_client
.
on
'error'
,
(
err
)
->
log
.
warn
"PostgreSQL ERROR: "
,
err
return
...
...
@@ -346,7 +347,7 @@ if settings.modules.challonge.enabled
challonge_module_name
=
'challonge'
if
settings
.
modules
.
challonge
.
use_custom_module
challonge_module_name
=
settings
.
modules
.
challonge
.
use_custom_module
challonge
=
require
(
challonge_module_name
).
createClient
(
settings
.
modules
.
challonge
.
options
)
challonge
=
global
.
challonge
=
require
(
challonge_module_name
).
createClient
(
settings
.
modules
.
challonge
.
options
)
if
settings
.
modules
.
challonge
.
cache_ttl
challonge_cache
=
[]
challonge_queue_callbacks
=
[[],
[]]
...
...
@@ -394,7 +395,7 @@ if settings.modules.challonge.enabled
catch
err
log
.
warn
(
"Errored pushing scores to Challonge."
,
err
)
return
refresh_challonge_cache
=
()
->
refresh_challonge_cache
=
global
.
refresh_challonge_cache
=
()
->
if
settings
.
modules
.
challonge
.
cache_ttl
challonge_cache
[
0
]
=
null
challonge_cache
[
1
]
=
null
...
...
@@ -433,7 +434,7 @@ get_memory_usage = get_memory_usage = ()->
cached
=
parseInt
(
line
[
6
],
10
)
actualFree
=
free
+
buffers
+
cached
percentUsed
=
parseFloat
(((
1
-
(
actualFree
/
total
))
*
100
).
toFixed
(
2
))
memory_usage
=
percentUsed
memory_usage
=
global
.
memory_usage
=
percentUsed
return
return
get_memory_usage
()
...
...
ygopro-server.js
View file @
d72e7a82
...
...
@@ -327,7 +327,7 @@
if
(
settings
.
modules
.
cloud_replay
.
enabled
)
{
redis
=
require
(
'
redis
'
);
zlib
=
require
(
'
zlib
'
);
redisdb
=
redis
.
createClient
(
settings
.
modules
.
cloud_replay
.
redis
);
redisdb
=
global
.
redisdb
=
redis
.
createClient
(
settings
.
modules
.
cloud_replay
.
redis
);
redisdb
.
on
(
'
error
'
,
function
(
err
)
{
log
.
warn
(
err
);
});
...
...
@@ -344,6 +344,7 @@
}
});
}
global
.
real_windbot_server_ip
=
real_windbot_server_ip
;
}
if
(
settings
.
modules
.
heartbeat_detection
.
enabled
)
{
...
...
@@ -364,7 +365,7 @@
if
(
settings
.
modules
.
mycard
.
enabled
)
{
pgClient
=
require
(
'
pg
'
).
Client
;
pg_client
=
new
pgClient
(
settings
.
modules
.
mycard
.
auth_database
);
pg_client
=
global
.
pg_client
=
new
pgClient
(
settings
.
modules
.
mycard
.
auth_database
);
pg_client
.
on
(
'
error
'
,
function
(
err
)
{
log
.
warn
(
"
PostgreSQL ERROR:
"
,
err
);
});
...
...
@@ -407,7 +408,7 @@
if
(
settings
.
modules
.
challonge
.
use_custom_module
)
{
challonge_module_name
=
settings
.
modules
.
challonge
.
use_custom_module
;
}
challonge
=
require
(
challonge_module_name
).
createClient
(
settings
.
modules
.
challonge
.
options
);
challonge
=
global
.
challonge
=
require
(
challonge_module_name
).
createClient
(
settings
.
modules
.
challonge
.
options
);
if
(
settings
.
modules
.
challonge
.
cache_ttl
)
{
challonge_cache
=
[];
}
...
...
@@ -470,7 +471,7 @@
log
.
warn
(
"
Errored pushing scores to Challonge.
"
,
err
);
}
};
refresh_challonge_cache
=
function
()
{
refresh_challonge_cache
=
global
.
refresh_challonge_cache
=
function
()
{
if
(
settings
.
modules
.
challonge
.
cache_ttl
)
{
challonge_cache
[
0
]
=
null
;
challonge_cache
[
1
]
=
null
;
...
...
@@ -503,7 +504,7 @@
actualFree
=
free
+
buffers
+
cached
;
}
percentUsed
=
parseFloat
(((
1
-
(
actualFree
/
total
))
*
100
).
toFixed
(
2
));
memory_usage
=
percentUsed
;
memory_usage
=
global
.
memory_usage
=
percentUsed
;
});
};
...
...
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