Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
change
sglang
Commits
2187f362
Unverified
Commit
2187f362
authored
Jun 25, 2024
by
Lianmin Zheng
Committed by
GitHub
Jun 25, 2024
Browse files
Add a new arguments log_level_http to control the HTTP logging (#563)
parent
9465b668
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
24 deletions
+21
-24
python/sglang/srt/server.py
python/sglang/srt/server.py
+6
-3
python/sglang/srt/server_args.py
python/sglang/srt/server_args.py
+15
-21
No files found.
python/sglang/srt/server.py
View file @
2187f362
...
@@ -58,6 +58,8 @@ from sglang.srt.utils import (
...
@@ -58,6 +58,8 @@ from sglang.srt.utils import (
from
sglang.utils
import
get_exception_traceback
from
sglang.utils
import
get_exception_traceback
logger
=
logging
.
getLogger
(
__name__
)
asyncio
.
set_event_loop_policy
(
uvloop
.
EventLoopPolicy
())
asyncio
.
set_event_loop_policy
(
uvloop
.
EventLoopPolicy
())
...
@@ -192,7 +194,7 @@ def launch_server(server_args: ServerArgs, pipe_finish_writer, model_overide_arg
...
@@ -192,7 +194,7 @@ def launch_server(server_args: ServerArgs, pipe_finish_writer, model_overide_arg
for
i
in
range
(
tp_size_local
):
for
i
in
range
(
tp_size_local
):
start_rpyc_service_process
(
ModelTpService
,
model_port_args
[
0
].
model_tp_ports
[
i
])
start_rpyc_service_process
(
ModelTpService
,
model_port_args
[
0
].
model_tp_ports
[
i
])
if
server_args
.
node_rank
!=
0
:
if
server_args
.
node_rank
!=
0
:
print
(
"
Listen for connections..."
)
logger
.
info
(
f
"[node_rank=
{
server_args
.
node_rank
}
]:
Listen for connections..."
)
while
True
:
while
True
:
pass
pass
...
@@ -275,9 +277,10 @@ def launch_server(server_args: ServerArgs, pipe_finish_writer, model_overide_arg
...
@@ -275,9 +277,10 @@ def launch_server(server_args: ServerArgs, pipe_finish_writer, model_overide_arg
except
Exception
as
e
:
except
Exception
as
e
:
if
pipe_finish_writer
is
not
None
:
if
pipe_finish_writer
is
not
None
:
pipe_finish_writer
.
send
(
get_exception_traceback
())
pipe_finish_writer
.
send
(
get_exception_traceback
())
print
(
f
"Initialization failed. warmup error:
{
e
}
"
)
print
(
f
"Initialization failed. warmup error:
{
e
}
"
,
flush
=
True
)
raise
e
raise
e
logger
.
info
(
"The server is fired up and ready to roll!"
)
if
pipe_finish_writer
is
not
None
:
if
pipe_finish_writer
is
not
None
:
pipe_finish_writer
.
send
(
"init ok"
)
pipe_finish_writer
.
send
(
"init ok"
)
...
@@ -290,7 +293,7 @@ def launch_server(server_args: ServerArgs, pipe_finish_writer, model_overide_arg
...
@@ -290,7 +293,7 @@ def launch_server(server_args: ServerArgs, pipe_finish_writer, model_overide_arg
app
,
app
,
host
=
server_args
.
host
,
host
=
server_args
.
host
,
port
=
server_args
.
port
,
port
=
server_args
.
port
,
log_level
=
server_args
.
log_level
,
log_level
=
server_args
.
log_level
_http
or
server_args
.
log_level_http
,
timeout_keep_alive
=
5
,
timeout_keep_alive
=
5
,
loop
=
"uvloop"
,
loop
=
"uvloop"
,
)
)
...
...
python/sglang/srt/server_args.py
View file @
2187f362
...
@@ -37,9 +37,8 @@ class ServerArgs:
...
@@ -37,9 +37,8 @@ class ServerArgs:
# Logging
# Logging
log_level
:
str
=
"info"
log_level
:
str
=
"info"
log_level_http
:
Optional
[
str
]
=
None
log_requests
:
bool
=
False
log_requests
:
bool
=
False
disable_log_stats
:
bool
=
False
log_stats_interval
:
int
=
10
show_time_cost
:
bool
=
False
show_time_cost
:
bool
=
False
# Other
# Other
...
@@ -106,7 +105,7 @@ class ServerArgs:
...
@@ -106,7 +105,7 @@ class ServerArgs:
type
=
int
,
type
=
int
,
nargs
=
"*"
,
nargs
=
"*"
,
default
=
[],
default
=
[],
help
=
"
A
dditional ports specified for the server."
,
help
=
"
The a
dditional ports specified for the server."
,
)
)
parser
.
add_argument
(
parser
.
add_argument
(
"--load-format"
,
"--load-format"
,
...
@@ -179,7 +178,7 @@ class ServerArgs:
...
@@ -179,7 +178,7 @@ class ServerArgs:
type
=
str
,
type
=
str
,
default
=
ServerArgs
.
schedule_heuristic
,
default
=
ServerArgs
.
schedule_heuristic
,
choices
=
[
"lpm"
,
"random"
,
"fcfs"
,
"dfs-weight"
],
choices
=
[
"lpm"
,
"random"
,
"fcfs"
,
"dfs-weight"
],
help
=
"
S
cheduling
H
euristic."
,
help
=
"
The s
cheduling
h
euristic."
,
)
)
parser
.
add_argument
(
parser
.
add_argument
(
"--schedule-conservativeness"
,
"--schedule-conservativeness"
,
...
@@ -191,7 +190,7 @@ class ServerArgs:
...
@@ -191,7 +190,7 @@ class ServerArgs:
"--tp-size"
,
"--tp-size"
,
type
=
int
,
type
=
int
,
default
=
ServerArgs
.
tp_size
,
default
=
ServerArgs
.
tp_size
,
help
=
"Tensor parallelism size."
,
help
=
"T
he t
ensor parallelism size."
,
)
)
parser
.
add_argument
(
parser
.
add_argument
(
"--stream-interval"
,
"--stream-interval"
,
...
@@ -203,29 +202,24 @@ class ServerArgs:
...
@@ -203,29 +202,24 @@ class ServerArgs:
"--random-seed"
,
"--random-seed"
,
type
=
int
,
type
=
int
,
default
=
ServerArgs
.
random_seed
,
default
=
ServerArgs
.
random_seed
,
help
=
"
R
andom seed."
,
help
=
"
The r
andom seed."
,
)
)
parser
.
add_argument
(
parser
.
add_argument
(
"--log-level"
,
"--log-level"
,
type
=
str
,
type
=
str
,
default
=
ServerArgs
.
log_level
,
default
=
ServerArgs
.
log_level
,
help
=
"
L
ogging level"
,
help
=
"
The l
ogging level
of all loggers.
"
,
)
)
parser
.
add_argument
(
parser
.
add_argument
(
"--log-requests"
,
"--log-level-http"
,
action
=
"store_true"
,
type
=
str
,
help
=
"Log all requests"
,
default
=
ServerArgs
.
log_level_http
,
help
=
"The logging level of HTTP server. If not set, reuse --log-level by default."
,
)
)
parser
.
add_argument
(
parser
.
add_argument
(
"--
disable-log-sta
ts"
,
"--
log-reques
ts"
,
action
=
"store_true"
,
action
=
"store_true"
,
help
=
"Disable logging throughput stats."
,
help
=
"Log the inputs and outputs of all requests."
,
)
parser
.
add_argument
(
"--log-stats-interval"
,
type
=
int
,
default
=
ServerArgs
.
log_stats_interval
,
help
=
"Log stats interval in second."
,
)
)
parser
.
add_argument
(
parser
.
add_argument
(
"--show-time-cost"
,
"--show-time-cost"
,
...
@@ -244,13 +238,13 @@ class ServerArgs:
...
@@ -244,13 +238,13 @@ class ServerArgs:
"--dp-size"
,
"--dp-size"
,
type
=
int
,
type
=
int
,
default
=
ServerArgs
.
dp_size
,
default
=
ServerArgs
.
dp_size
,
help
=
"
D
ata parallelism size."
,
help
=
"
The d
ata parallelism size."
,
)
)
parser
.
add_argument
(
parser
.
add_argument
(
"--load-balance-method"
,
"--load-balance-method"
,
type
=
str
,
type
=
str
,
default
=
ServerArgs
.
load_balance_method
,
default
=
ServerArgs
.
load_balance_method
,
help
=
"
L
oad balancing strategy for data parallelism."
,
help
=
"
The l
oad balancing strategy for data parallelism."
,
choices
=
[
choices
=
[
"round_robin"
,
"round_robin"
,
"shortest_queue"
,
"shortest_queue"
,
...
@@ -267,7 +261,7 @@ class ServerArgs:
...
@@ -267,7 +261,7 @@ class ServerArgs:
"--nnodes"
,
"--nnodes"
,
type
=
int
,
type
=
int
,
default
=
1
,
default
=
1
,
help
=
"
N
umber of nodes"
help
=
"
The n
umber of nodes
.
"
)
)
parser
.
add_argument
(
parser
.
add_argument
(
"--node-rank"
,
"--node-rank"
,
...
...
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