mirror of
https://github.com/v2fly/v2ray-core.git
synced 2025-01-02 15:36:41 -05:00
Line separator
This commit is contained in:
parent
dc7d4a2309
commit
3bd4238e88
@ -4,6 +4,8 @@ import (
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
|
||||
"github.com/v2ray/v2ray-core/common/platform"
|
||||
)
|
||||
|
||||
const (
|
||||
@ -35,8 +37,7 @@ func (l *streamLogger) WriteLog(prefix, format string, v ...interface{}) {
|
||||
} else {
|
||||
data = fmt.Sprintf(format, v...)
|
||||
}
|
||||
l.writer.Write([]byte(prefix + data))
|
||||
l.writer.Write([]byte{'\n'})
|
||||
l.writer.Write([]byte(prefix + data + platform.LineSeparator()))
|
||||
}
|
||||
|
||||
var (
|
||||
|
@ -6,11 +6,10 @@ import (
|
||||
"os"
|
||||
)
|
||||
|
||||
type otherPlatformEnvironment struct {
|
||||
}
|
||||
|
||||
var environmentInstance = &otherPlatformEnvironment{}
|
||||
|
||||
func (e *otherPlatformEnvironment) ExpandEnv(s string) string {
|
||||
func ExpandEnv(s string) string {
|
||||
return os.ExpandEnv(s)
|
||||
}
|
||||
|
||||
func LineSeparator() string {
|
||||
return "\n"
|
||||
}
|
||||
|
@ -1,10 +0,0 @@
|
||||
// Package platform provides platform specific functionalities.
|
||||
package platform
|
||||
|
||||
type environment interface {
|
||||
ExpandEnv(s string) string
|
||||
}
|
||||
|
||||
func ExpandEnv(s string) string {
|
||||
return environmentInstance.ExpandEnv(s)
|
||||
}
|
@ -2,16 +2,11 @@
|
||||
|
||||
package platform
|
||||
|
||||
import (
|
||||
"os"
|
||||
)
|
||||
|
||||
type windowsEnvironment struct {
|
||||
}
|
||||
|
||||
var environmentInstance = &windowsEnvironment{}
|
||||
|
||||
func (e *windowsEnvironment) ExpandEnv(s string) string {
|
||||
func ExpandEnv(s string) string {
|
||||
// TODO
|
||||
return s
|
||||
}
|
||||
|
||||
func LineSeparator() string {
|
||||
return "\r\n"
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user