Skip to content

Commit 41d751a

Browse files
committed
fix: export prxoy env error
remove proxy setup to network module Log:
1 parent 8450c9b commit 41d751a

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

bin/dde-session-daemon/main.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import (
3737
"github.com/linuxdeepin/go-lib/dbusutil"
3838
. "github.com/linuxdeepin/go-lib/gettext"
3939
"github.com/linuxdeepin/go-lib/log"
40-
"github.com/linuxdeepin/go-lib/proxy"
4140
"github.com/linuxdeepin/go-lib/utils"
4241
"github.com/linuxdeepin/go-lib/xdg/basedir"
4342
)
@@ -197,7 +196,6 @@ func main() {
197196
}
198197

199198
C.init()
200-
proxy.SetupProxy()
201199

202200
app := NewSessionDaemon(logger)
203201
if app == nil {

network/module.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ package network
77
import (
88
"time"
99

10-
"github.com/linuxdeepin/go-lib/log"
11-
libnotify "github.com/linuxdeepin/go-lib/notify"
1210
"github.com/linuxdeepin/dde-daemon/loader"
1311
"github.com/linuxdeepin/dde-daemon/network/proxychains"
12+
"github.com/linuxdeepin/go-lib/log"
13+
libnotify "github.com/linuxdeepin/go-lib/notify"
14+
"github.com/linuxdeepin/go-lib/proxy"
1415
)
1516

1617
var (
@@ -57,6 +58,8 @@ func (d *Module) GetDependencies() []string {
5758
}
5859

5960
func (d *Module) start() error {
61+
proxy.SetupProxy()
62+
6063
service := loader.GetService()
6164
manager = NewManager(service)
6265
manager.init()

0 commit comments

Comments
 (0)