diff --git a/ci/travis.sh b/ci/travis.sh index a653973..2676d8f 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -34,17 +34,18 @@ env | sort : "${COMPILER_IS_GNUCXX:=OFF}" chmod +x autorevision.sh export VERSION_ID=$(./autorevision.sh -t sh -o version | grep VCS_TAG | sed 's/^.*v//g' | sed 's/"//g'| sed 's/[[:alpha:]]//g'|tr -d "_=") +export COMMIT_ID=$(./autorevision.sh -t sh -o version | grep VCS_SHORT_HASH | sed 's/^.*v//g' | sed 's/"//g') # export VERSION_ID="1.0.0" yum install -y golang go version export GOPROXY=https://proxy.golang.com.cn,direct go env mkdir -p ./rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} -mv ../coredump-tools ../coredump-tools-${VERSION_ID} -tar -czvf ./rpmbuild/SOURCES/coredump-tools-${VERSION_ID}.tar.gz ../coredump-tools-${VERSION_ID} +mv ../coredump-tools ../coredump-tools-${VERSION_ID}-${COMMIT_ID} +tar -czvf ./rpmbuild/SOURCES/coredump-tools-${VERSION_ID}-${COMMIT_ID}.tar.gz ../coredump-tools-${VERSION_ID}-${COMMIT_ID} cp ./script/coredump.spec ./rpmbuild/SPECS -rpmbuild --define "_topdir `pwd`/rpmbuild" --define "_version ${VERSION_ID}" --define "_release release" -ba ./rpmbuild/SPECS/coredump.spec -cd /builds/linxin/coredump-tools-${VERSION_ID}/rpmbuild/RPMS/x86_64 +rpmbuild --define "_topdir `pwd`/rpmbuild" --define "_version ${VERSION_ID}-${COMMIT_ID}" --define "_release release" -ba ./rpmbuild/SPECS/coredump.spec +cd /builds/linxin/coredump-tools-${VERSION_ID}-${COMMIT_ID}/rpmbuild/RPMS/x86_64 ls -halt ./*.rpm if [ -n "${UPLOAD}" ]; then diff --git a/coredump.go b/coredump.go deleted file mode 100644 index ac6edaa..0000000 --- a/coredump.go +++ /dev/null @@ -1,63 +0,0 @@ -package main - -import ( - "coredump-tools/types" - "fmt" - "net" - "os/exec" - "syscall" -) - -func coredumpInit(coreconfig types.Coreconfig) error { - cmd := exec.Command("sysctl", "-w", "kernel.core_pattern='"+coreconfig.Core_pattern+"'") - err := cmd.Run() - if err != nil { - return err - } - cmd = exec.Command("sysctl", "-w", "kernel.core_pipe_limit="+coreconfig.Core__pipe_limit) - err = cmd.Run() - if err != nil { - return err - } - cmd = exec.Command("sysctl", "-w", "kernel.suid_dumpable=2") - err = cmd.Run() - if err != nil { - return err - } - cmd = exec.Command("ulimit", "-c", coreconfig.Core_limited) - err = cmd.Run() - if err != nil { - return err - } - return nil -} - -func coredumpHandler(coreconfig types.Coreconfig) error { - syscall.Unlink(coreconfig.Socket_path) - laddr, err := net.ResolveUnixAddr("unix", coreconfig.Socket_path) - if err != nil { - return err - } - listener, err := net.ListenUnix("unix", laddr) - if err != nil { - return err - } - defer listener.Close() - for { - c, err := listener.Accept() - if err != nil { - fmt.Println(err) - } - go HandleServerConn(c) - } -} -func HandleServerConn(c net.Conn) { - defer c.Close() - buf := make([]byte, 1024) - nr, err := c.Read(buf) - if err != nil { - fmt.Println(err) - return - } - fmt.Println(buf[0:nr]) -}