diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | mk/Makefile.deb | 3 | ||||
| -rw-r--r-- | mk/Makefile.rpm | 1 | ||||
| -rw-r--r-- | mk/Makefile.tgz | 3 | ||||
| -rw-r--r-- | syslog/syslog.go (renamed from xe-daemon/syslog.go) | 2 | ||||
| -rw-r--r-- | xe-daemon/xe-daemon.go | 3 |
6 files changed, 10 insertions, 5 deletions
@@ -4,7 +4,7 @@ PRODUCT_MICRO_VERSION=80 PRODUCT_VERSION = $(PRODUCT_MAJOR_VERSION).$(PRODUCT_MINOR_VERSION).$(PRODUCT_MICRO_VERSION) GO_BUILD = go build -GO_FLAGS = -a -x +GO_FLAGS = -v REPO = $(shell pwd) SOURCEDIR = $(REPO)/mk @@ -29,6 +29,7 @@ endif XE_DAEMON_SOURCES := XE_DAEMON_SOURCES += ./xe-daemon/xe-daemon.go +XE_DAEMON_SOURCES += ./syslog/syslog.go XE_DAEMON_SOURCES += ./guestmetric/guestmetric.go XE_DAEMON_SOURCES += ./guestmetric/guestmetric_linux.go XE_DAEMON_SOURCES += ./xenstoreclient/xenstore.go diff --git a/mk/Makefile.deb b/mk/Makefile.deb index 276790f..e22a207 100644 --- a/mk/Makefile.deb +++ b/mk/Makefile.deb @@ -31,12 +31,13 @@ DEBPOOLDIR := debian/pool/main/x/xe-guest-utilities GOTARBALL = /distfiles/golang/go1.4.2.linux-386.tar.gz GOROOT = $(MY_OBJ_DIR)/go GOBIN = GOROOT=$(GOROOT) $(GOROOT)/bin/go -GOFLAGS = -a -x +GOFLAGS = -v GOBUILDDIR = $(MY_OBJ_DIR)/gobuild GO_SOURCE_REPO = $(call git_loc,xe-guest-utilities) XE_DAEMON_GO_SOURCES := XE_DAEMON_GO_SOURCES += ./xe-daemon/xe-daemon.go # this should be the first one +XE_DAEMON_GO_SOURCES += ./syslog/syslog.go XE_DAEMON_GO_SOURCES += ./guestmetric/guestmetric.go XE_DAEMON_GO_SOURCES += ./guestmetric/guestmetric_linux.go XE_DAEMON_GO_SOURCES += ./xenstoreclient/xenstore.go diff --git a/mk/Makefile.rpm b/mk/Makefile.rpm index 8bd61ec..d7bd7d5 100644 --- a/mk/Makefile.rpm +++ b/mk/Makefile.rpm @@ -34,6 +34,7 @@ GO_SOURCE_REPO = $(call git_loc,xe-guest-utilities) XE_DAEMON_GO_SOURCES := XE_DAEMON_GO_SOURCES += ./xe-daemon/xe-daemon.go # this should be the first one +XE_DAEMON_GO_SOURCES += ./syslog/syslog.go XE_DAEMON_GO_SOURCES += ./guestmetric/guestmetric.go XE_DAEMON_GO_SOURCES += ./guestmetric/guestmetric_linux.go XE_DAEMON_GO_SOURCES += ./xenstoreclient/xenstore.go diff --git a/mk/Makefile.tgz b/mk/Makefile.tgz index 1fe4582..86c6995 100644 --- a/mk/Makefile.tgz +++ b/mk/Makefile.tgz @@ -30,13 +30,14 @@ DESTDIR := $(MY_OBJ_DIR)/$(PACKAGE)/ GOTARBALL = /distfiles/golang/go1.4.2.linux-386.tar.gz GOROOT = $(MY_OBJ_DIR)/go GOBIN = GOROOT=$(GOROOT) $(GOROOT)/bin/go -GOFLAGS = -a -x +GOFLAGS = -v GOBUILDDIR = $(MY_OBJ_DIR)/gobuild GO_SOURCE_REPO = $(call git_loc,xe-guest-utilities) XE_DAEMON_GO_SOURCES := XE_DAEMON_GO_SOURCES += ./xe-daemon/xe-daemon.go # this should be the first one +XE_DAEMON_GO_SOURCES += ./syslog/syslog.go XE_DAEMON_GO_SOURCES += ./guestmetric/guestmetric.go XE_DAEMON_GO_SOURCES += ./guestmetric/guestmetric_linux.go XE_DAEMON_GO_SOURCES += ./xenstoreclient/xenstore.go diff --git a/xe-daemon/syslog.go b/syslog/syslog.go index a074407..7acc87d 100644 --- a/xe-daemon/syslog.go +++ b/syslog/syslog.go @@ -1,7 +1,7 @@ // To run 32bit xe-daemon under 64bit system, // Here we re-implement a syslog writer base on logger CLI. -package main +package syslog import ( "io" diff --git a/xe-daemon/xe-daemon.go b/xe-daemon/xe-daemon.go index 3ad8c27..839e454 100644 --- a/xe-daemon/xe-daemon.go +++ b/xe-daemon/xe-daemon.go @@ -2,6 +2,7 @@ package main import ( guestmetric "../guestmetric" + syslog "../syslog" xenstoreclient "../xenstoreclient" "flag" "fmt" @@ -38,7 +39,7 @@ func main() { var loggerWriter io.Writer = os.Stderr var topic string = LoggerName - if w, err := NewSyslogWriter(topic); err == nil { + if w, err := syslog.NewSyslogWriter(topic); err == nil { loggerWriter = w topic = "" } else { |