@@ -277,9 +277,8 @@ function Server:initialize()
277
277
local max_unix_socket_path = {linux = 107 , other = 103 }
278
278
local system = os.execute (' [ $(uname) = Linux ]' ) == 0 and ' linux' or ' other'
279
279
if parsed_net_box_uri .unix :len () > max_unix_socket_path [system ] then
280
- error ((' Unix domain socket path cannot be longer than %d chars. ' ..
281
- ' Current path is: %s' ):format (max_unix_socket_path [system ],
282
- parsed_net_box_uri .unix ))
280
+ error ((' Unix domain socket path cannot be longer than %d chars. Current path is: %s' )
281
+ :format (max_unix_socket_path [system ], parsed_net_box_uri .unix ))
283
282
end
284
283
end
285
284
if type (self .net_box_uri ) == ' table' then
@@ -572,27 +571,16 @@ function Server:stop()
572
571
if not ok and not err :find (' Process is terminated when waiting for' ) then
573
572
error (err )
574
573
end
575
- if self .process .output_beautifier .stderr :find (' Segmentation fault' ) then
576
- error (
577
- (' Segmentation fault during process termination (alias: %s, workdir: %s, pid: %d)\n %s' )
578
- :format (
579
- self .alias ,
580
- fio .basename (self .workdir ),
581
- self .process .pid ,
582
- self .process .output_beautifier .stderr
583
- )
584
- )
574
+ local workdir = fio .basename (self .workdir )
575
+ local pid = self .process .pid
576
+ local stderr = self .process .output_beautifier .stderr
577
+ if stderr :find (' Segmentation fault' ) then
578
+ error ((' Segmentation fault during process termination (alias: %s, workdir: %s, pid: %d)\n %s' )
579
+ :format (self .alias , workdir , pid , stderr ))
585
580
end
586
- if self .process .output_beautifier .stderr :find (' LeakSanitizer' ) then
587
- error (
588
- (' Memory leak during process execution (alias: %s, workdir: %s, pid: %s)\n %s' )
589
- :format (
590
- self .alias ,
591
- fio .basename (self .workdir ),
592
- self .process .pid ,
593
- self .process .output_beautifier .stderr
594
- )
595
- )
581
+ if stderr :find (' LeakSanitizer' ) then
582
+ error ((' Memory leak during process execution (alias: %s, workdir: %s, pid: %s)\n %s' )
583
+ :format (self .alias , workdir , pid , stderr ))
596
584
end
597
585
log .info (' Process of server %s (pid: %d) killed' , self .alias , self .process .pid )
598
586
self .process = nil
@@ -833,8 +821,7 @@ function Server:exec(fn, args, options)
833
821
end
834
822
835
823
if not are_fn_args_array (fn , args ) then
836
- error ((' bad argument #3 for exec at %s: an array is required' )
837
- :format (utils .get_fn_location (fn )))
824
+ error ((' bad argument #3 for exec at %s: an array is required' ):format (utils .get_fn_location (fn )))
838
825
end
839
826
840
827
-- The function `fn` can return multiple values and we cannot use the
0 commit comments