lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-01-04 16:25:21 -05:00
Code Issues Releases Wiki Activity

merge log into common log

Browse Source
This commit is contained in:
Darien Raymond
2017-12-19 21:28:12 +01:00
parent 054ceb865d
commit f4c35db968
45 changed files with 297 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
testing/scenarios/common.go
View File

@@ -1,7 +1,6 @@
package scenarios
import (
"errors"
"fmt"
"io"
"io/ioutil"
@@ -14,8 +13,8 @@ import (
"github.com/golang/protobuf/proto"
"v2ray.com/core"
"v2ray.com/core/app/log"
"v2ray.com/core/common"
"v2ray.com/core/common/log"
"v2ray.com/core/common/net"
"v2ray.com/core/common/retry"
)
@@ -114,12 +113,18 @@ func GetSourcePath() string {
}
func CloseAllServers(servers []*exec.Cmd) {
log.Trace(errors.New("Closing all servers."))
log.Record(&log.GeneralMessage{
Severity: log.Severity_Info,
Content: "Closing all servers.",
})
for _, server := range servers {
server.Process.Signal(os.Interrupt)
}
for _, server := range servers {
server.Process.Wait()
}
log.Trace(errors.New("All server closed."))
log.Record(&log.GeneralMessage{
Severity: log.Severity_Info,
Content: "All server closed.",
})
}