uniform logger name format.

Change-Id: Ia88d3f3477556cc7cba23e2c5852c1bb23c1c281
superaudio · Jun 23, 2015 · 01506bb · 01506bb
1 parent f95d9b4
commit 01506bb
Show file tree

Hide file tree

Showing 28 changed files with 29 additions and 29 deletions.
diff --git a/accounts/accounts.go b/accounts/accounts.go
@@ -28,7 +28,7 @@ import (
 
 var (
  _m *Manager
- logger = log.NewLogger(dbusSender)
+ logger = log.NewLogger("dde-daemon/accounts")
 )
 
 func Start() {

diff --git a/appearance/main.go b/appearance/main.go
@@ -27,7 +27,7 @@ import (
 )
 
 var (
- logger = log.NewLogger("com.deepin.daemon.Themes")
+ logger = log.NewLogger("dde-daemon/appearance")
 )
 
 var _manager *Manager

diff --git a/audio/audio.go b/audio/audio.go
@@ -5,7 +5,7 @@ import "pkg.linuxdeepin.com/lib/log"
 import "pkg.linuxdeepin.com/lib/pulse"
 import libsound "dbus/com/deepin/api/sound"
 
-var logger = log.NewLogger("com.deepin.daemon.Audio")
+var logger = log.NewLogger("dde-daemon/audio")
 
 type Audio struct {
  init bool

diff --git a/bin/dde-session-daemon/daemon.go b/bin/dde-session-daemon/daemon.go
@@ -43,7 +43,7 @@ import "os"
 import "pkg.linuxdeepin.com/lib/dbus"
 import "pkg.linuxdeepin.com/dde-daemon"
 
-var logger = log.NewLogger("com.deepin.daemon")
+var logger = log.NewLogger("dde-daemon/dde-session-daemon")
 
 func main() {
  InitI18n()

diff --git a/bin/dde-system-daemon/main.go b/bin/dde-system-daemon/main.go
@@ -9,7 +9,7 @@ import _ "pkg.linuxdeepin.com/dde-daemon/accounts"
 import "pkg.linuxdeepin.com/dde-daemon"
 import . "pkg.linuxdeepin.com/lib/gettext"
 
-var logger = log.NewLogger("com.deepin.daemon")
+var logger = log.NewLogger("dde-daemon/dde-system-daemon")
 
 func main() {
  logger.BeginTracing()

diff --git a/bin/grub2/main.go b/bin/grub2/main.go
@@ -81,7 +81,7 @@ func main() {
 }
 
 func runAsDaemon() {
- logger := log.NewLogger(grub2.DbusGrubDest + ".Runner")
+ logger := log.NewLogger("dde-daemon/grub2-runner")
  logger.BeginTracing()
  defer logger.EndTracing()
 

diff --git a/bin/grub2ext/main.go b/bin/grub2ext/main.go
@@ -31,7 +31,7 @@ import (
  "time"
 )
 
-var logger = log.NewLogger(grub2.DbusGrub2ExtDest + ".Runner")
+var logger = log.NewLogger("dde-daemon/grub2ext-runner")
 var argDebug bool
 
 func main() {

diff --git a/bin/personalization/main.go b/bin/personalization/main.go
@@ -34,7 +34,7 @@ const (
 )
 
 var (
- Logger = log.NewLogger(DEST)
+ Logger = log.NewLogger("dde-daemon/personalization")
 )
 
 func main() {

diff --git a/bin/theme-thumb-tool/main.go b/bin/theme-thumb-tool/main.go
@@ -42,7 +42,7 @@ import (
 
 var (
  forceFlag = false
- logger = log.NewLogger("theme-thumb-tool")
+ logger = log.NewLogger("dde-daemon/theme-thumb-tool")
 )
 
 const (

diff --git a/bluetooth/main.go b/bluetooth/main.go
@@ -27,7 +27,7 @@ import (
 )
 
 var (
- logger = log.NewLogger(dbusBluetoothDest)
+ logger = log.NewLogger("dde-daemon/bluetooth")
  bluetooth *Bluetooth
 )
 

diff --git a/dock/main.go b/dock/main.go
@@ -12,7 +12,7 @@ import (
 )
 
 var (
- logger = log.NewLogger("com.deepin.daemon.Dock")
+ logger = log.NewLogger("dde-daemon/dock")
  region *Region = nil
  setting *Setting = nil
  hideModemanager *HideStateManager = nil

diff --git a/dsc/dsc.go b/dsc/dsc.go
@@ -29,7 +29,7 @@ import (
  "time"
 )
 
-var logger = log.NewLogger("dde-session-daemon/dsc")
+var logger = log.NewLogger("dde-daemon/dsc")
 
 var quitFlag = make(chan bool)
 

diff --git a/grub2/module.go b/grub2/module.go
@@ -27,7 +27,7 @@ import (
 )
 
 var (
- logger = log.NewLogger(DbusGrubDest)
+ logger = log.NewLogger("dde-daemon/grub2")
  grub *Grub2
 )
 

diff --git a/inputdevices/main.go b/inputdevices/main.go
@@ -44,7 +44,7 @@ func Start() {
  return
  }
 
- var logger = log.NewLogger("com.deepin.daemon.InputDevices")
+ var logger = log.NewLogger("dde-daemon/inputdevices")
  logger.BeginTracing()
 
  if !initDeviceChangedWatcher() {

diff --git a/keybinding/main.go b/keybinding/main.go
@@ -31,7 +31,7 @@ import (
 )
 
 var (
- logger = log.NewLogger("daemon/keybinding")
+ logger = log.NewLogger("dde-daemon/keybinding")
  X *xgbutil.XUtil
 
  grabKeyBindsMap = make(map[KeycodeInfo]string)

diff --git a/langselector/locale.go b/langselector/locale.go
@@ -73,7 +73,7 @@ func newLangSelector(l *log.Logger) *LangSelector {
  if l != nil {
  lang.logger = l
  } else {
- lang.logger = log.NewLogger(dbusSender)
+ lang.logger = log.NewLogger("dde-daemon/langselector")
  }
 
  var err error

diff --git a/langselector/main.go b/langselector/main.go
@@ -34,7 +34,7 @@ const (
 var _lang *LangSelector
 
 func Start() *LangSelector {
- var logger = log.NewLogger(dbusSender)
+ var logger = log.NewLogger("dde-daemon/langselector")
 
  if !lib.UniqueOnSession(dbusSender) {
  logger.Warning("There is a LangSelector running...")

diff --git a/launcher/main.go b/launcher/main.go
@@ -16,7 +16,7 @@ import (
  "pkg.linuxdeepin.com/lib/log"
 )
 
-var logger = log.NewLogger("dde-daemon/launcher-daemon")
+var logger = log.NewLogger("dde-daemon/launcher")
 var launcher *Launcher = nil
 
 func Stop() {

diff --git a/loader.go b/loader.go
@@ -4,7 +4,7 @@ import (
  "pkg.linuxdeepin.com/lib/log"
 )
 
-var logger = log.NewLogger("dde.daemon.loader")
+var logger = log.NewLogger("dde-daemon/loader")
 
 type Module struct {
  Name string

diff --git a/mime/main.go b/mime/main.go
@@ -25,7 +25,7 @@ const (
 )
 
 var (
- logger = log.NewLogger(_DEFAULT_APPS_DEST)
+ logger = log.NewLogger("dde-daemon/mime")
 )
 
 func (dapp *DefaultApps) GetDBusInfo() dbus.DBusInfo {

diff --git a/mounts/manager.go b/mounts/manager.go
@@ -61,7 +61,7 @@ type Manager struct {
 func NewManager() *Manager {
  var m = Manager{}
 
- m.logger = log.NewLogger(dbusSender)
+ m.logger = log.NewLogger("dde-daemon/mounts")
  m.monitor = gio.VolumeMonitorGet()
  m.setting, _ = dutils.CheckAndNewGSettings(mediaHandlerSchema)
  m.diskCache = make(map[string]*diskObjectInfo)

diff --git a/network/main.go b/network/main.go
@@ -27,7 +27,7 @@ import (
 )
 
 var (
- logger = log.NewLogger(dbusNetworkDest)
+ logger = log.NewLogger("dde-daemon/network")
  manager *Manager
 )
 

diff --git a/power/dbus_ifc_test.go b/power/dbus_ifc_test.go
@@ -35,7 +35,7 @@ type DBusInterfaceTest struct{}
 
 func init() {
  if logger == nil {
- logger = log.NewLogger("com.deepin.daemon.Power")
+ logger = log.NewLogger("dde-daemon/power")
  }
 
  C.Suite(&DBusInterfaceTest{})

diff --git a/power/main.go b/power/main.go
@@ -5,7 +5,7 @@ import "pkg.linuxdeepin.com/lib/dbus/property"
 import "pkg.linuxdeepin.com/lib/gio-2.0"
 import ss "dbus/org/freedesktop/screensaver"
 
-var logger = log.NewLogger("com.deepin.daemon.Power")
+var logger = log.NewLogger("dde-daemon/power")
 
 type Power struct {
  coreSettings *gio.Settings

diff --git a/screenedge/main.go b/screenedge/main.go
@@ -35,7 +35,7 @@ var (
  dspObj *libdsp.Display
  areaObj *libarea.XMouseArea
  launchObj *launcher.Launcher
- logger = log.NewLogger(ZONE_DEST)
+ logger = log.NewLogger("dde-daemon/screenedge")
 
  mutex = new(sync.Mutex)
  edgeActionMap = make(map[string]string)

diff --git a/screensaver/screensaver.go b/screensaver/screensaver.go
@@ -10,7 +10,7 @@ import (
  "sync"
 )
 
-var logger = log.NewLogger("org.freedesktop.ScreenSaver")
+var logger = log.NewLogger("dde-daemon/screensaver")
 
 type inhibitor struct {
  cookie uint32

diff --git a/systeminfo/system_info.go b/systeminfo/system_info.go
@@ -218,7 +218,7 @@ func NewSystemInfo(l *log.Logger) *SystemInfo {
  sys := &SystemInfo{}
 
  if l == nil {
- l = log.NewLogger("com.deepin.daemon.SystemInfo")
+ l = log.NewLogger("dde-daemon/systeminfo")
  }
  sys.logger = l
 
@@ -267,7 +267,7 @@ func Start() {
  return
  }
 
- logger := log.NewLogger("com.deepin.daemon.SystemInfo")
+ logger := log.NewLogger("dde-daemon/systeminfo")
  logger.BeginTracing()
 
  _sysInfo = NewSystemInfo(logger)

diff --git a/timedate/timedate.go b/timedate/timedate.go
@@ -29,7 +29,7 @@ import (
 var (
  _manager *Manager
 
- logger = log.NewLogger(dbusSender)
+ logger = log.NewLogger("dde-daemon/timedate")
 )
 
 func Start() {