From 31086ce17dac38afe03084ed202c4483b8495481 Mon Sep 17 00:00:00 2001 From: snoop Date: Fri, 4 Aug 2017 11:55:31 +0900 Subject: [PATCH] fixed log, package --- agent_api/config_manager/config_test.go | 4 ++-- collector/collector.go | 4 ++-- config_manager/config_manager.go | 18 +++++++++--------- config_manager/config_manager_test.go | 4 ++-- crawler/crawler.go | 4 ++-- matcher/activedirectory/activedirectory.go | 4 ++-- matcher/cassandra/cassandra.go | 4 ++-- matcher/dhcp/dhcp.go | 2 +- matcher/dns/dns.go | 4 ++-- matcher/ftp/ftp.go | 4 ++-- matcher/http/http.go | 4 ++-- matcher/imap/imap.go | 4 ++-- matcher/ldap/ldap.go | 4 ++-- matcher/matcher.go | 6 +++--- matcher/mongodb/mongodb.go | 4 ++-- matcher/mssql/mssql.go | 4 ++-- matcher/mysql/mysql.go | 4 ++-- matcher/netbios/netbios.go | 4 ++-- matcher/oracle/oracle.go | 4 ++-- matcher/pgsql/pgsql.go | 4 ++-- matcher/pgsql/pgsql_test.go | 2 +- matcher/pop/pop.go | 4 ++-- matcher/redis/redis.go | 4 ++-- matcher/redis/redisProtected.go | 4 ++-- matcher/rmi/rmi.go | 4 ++-- matcher/smb/smb.go | 4 ++-- matcher/smtp/smtp.go | 4 ++-- matcher/snmp/snmpv2.go | 4 ++-- matcher/snmp/snmpv3.go | 4 ++-- matcher/ssh/ssh.go | 4 ++-- matcher/telnet/telnet.go | 4 ++-- matcher/wmi/wmi.go | 4 ++-- 32 files changed, 70 insertions(+), 70 deletions(-) diff --git a/agent_api/config_manager/config_test.go b/agent_api/config_manager/config_test.go index e584fcb..6f4a561 100644 --- a/agent_api/config_manager/config_test.go +++ b/agent_api/config_manager/config_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "github.com/stretchr/testify/assert" "io/ioutil" - "log" + //log "github.com/cihub/seelog" "testing" ) @@ -12,7 +12,7 @@ func TestConfigRead(t *testing.T) { b, err := ioutil.ReadFile("/root/gowork/src/git.loafle.net/overflow/overflow_probe/agent_api/config_manager/test.json") if err != nil { - log.Panic(err) + t.Fatal(err) } var m = Config{} json.Unmarshal(b, &m) diff --git a/collector/collector.go b/collector/collector.go index 628c640..62613b5 100644 --- a/collector/collector.go +++ b/collector/collector.go @@ -6,7 +6,7 @@ import ( "git.loafle.net/overflow/overflow_probe/crawler/grpc" crm "git.loafle.net/overflow/overflow_probe/crawler_manager" s "git.loafle.net/overflow/overflow_probe/scheduler" - "log" + log "github.com/cihub/seelog" "strconv" "sync" "time" @@ -50,7 +50,7 @@ func (c *Collector) start(started chan bool, conf cm.ConfigManager) { for _, conf := range c.cm.GetSensors() { if err := c.addSensor(conf.Id); err != nil { - log.Println(err) + log.Debug(err) } } started <- true diff --git a/config_manager/config_manager.go b/config_manager/config_manager.go index 1153f4c..8c1bacc 100644 --- a/config_manager/config_manager.go +++ b/config_manager/config_manager.go @@ -3,9 +3,9 @@ package config_manager import ( "encoding/json" "git.loafle.net/overflow/overflow_probe/agent_api/config_manager" - "gopkg.in/yaml.v2" + log "github.com/cihub/seelog" + yaml "gopkg.in/yaml.v2" "io/ioutil" - "log" "os" "strings" "sync" @@ -66,7 +66,7 @@ func (c *configManager) loadCrawlerConfigAll() error { root := c.getConfigPath() files, err := ioutil.ReadDir(root) if err != nil { - log.Panic(err) + log.Error(err) } for _, file := range files { if file.IsDir() == true { @@ -85,7 +85,7 @@ func (c *configManager) loadCrawlerConfig(root string, dir string) { currentDir := root + separator + dir files, err := ioutil.ReadDir(currentDir) if err != nil { - log.Panic(err) + log.Error(err) } for _, file := range files { @@ -96,7 +96,7 @@ func (c *configManager) loadCrawlerConfig(root string, dir string) { } else { b, err := ioutil.ReadFile(currentDir + separator + file.Name()) if err != nil { - log.Panic(err) + log.Error(err) } var m = config_manager.Config{} json.Unmarshal(b, &m) @@ -113,7 +113,7 @@ func (c *configManager) addConfig(tmp string) { b, err := ioutil.ReadFile(path) if err != nil { // error process - log.Panic(err) + log.Error(err) } // 임시파일을 로드 , Config로 변환 @@ -121,7 +121,7 @@ func (c *configManager) addConfig(tmp string) { err = json.Unmarshal(b, &m) if err != nil { // error process - log.Panic(err) + log.Error(err) } // agent 폴더 / config / crawler / .. / .. / .. / 에 해당하는 파일이 있는지 확인, 있다면 삭제 @@ -133,7 +133,7 @@ func (c *configManager) addConfig(tmp string) { err = os.Remove(path) if err != nil { // error process - log.Panic(err) + log.Error(err) } // Config 맵에 저장 @@ -162,7 +162,7 @@ func (c *configManager) removeConfig(id string) { err := os.Remove(path) if err != nil { // error check - log.Panic(err) + log.Error(err) } // 해당 id 삭제 diff --git a/config_manager/config_manager_test.go b/config_manager/config_manager_test.go index d8e9fb3..e6c67fc 100644 --- a/config_manager/config_manager_test.go +++ b/config_manager/config_manager_test.go @@ -7,9 +7,9 @@ import ( "git.loafle.net/overflow/overflow_probe/agent_api/config_manager" "git.loafle.net/overflow/overflow_probe/agent_api/messages" "git.loafle.net/overflow/overflow_probe/agent_api/observer" + log "github.com/cihub/seelog" "github.com/google/uuid" "io/ioutil" - "log" "time" ) @@ -41,7 +41,7 @@ func TestAddConfig(t *testing.T) { // 원본 테스트 설정 파일 로드 b, err := ioutil.ReadFile("/root/gowork/src/git.loafle.net/overflow/overflow_probe/config_manager/test_agent/test.json") if err != nil { - log.Panic(err) + log.Error(err) } var m = config_manager.Config{} json.Unmarshal(b, &m) diff --git a/crawler/crawler.go b/crawler/crawler.go index b81a494..4ed4e62 100644 --- a/crawler/crawler.go +++ b/crawler/crawler.go @@ -5,7 +5,7 @@ import ( "errors" config "git.loafle.net/overflow/overflow_probe/agent_api/config_manager" - "log" + log "github.com/cihub/seelog" ) type Internal interface { @@ -33,7 +33,7 @@ func (c *CrawlerImpl) Init(data []byte) ([]byte, error) { _, err := c.Add(data) if err != nil { - log.Fatal(err) + log.Error(err) } // load all file in path diff --git a/matcher/activedirectory/activedirectory.go b/matcher/activedirectory/activedirectory.go index c473d96..f4679ce 100644 --- a/matcher/activedirectory/activedirectory.go +++ b/matcher/activedirectory/activedirectory.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/binary" - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" ) const ( diff --git a/matcher/cassandra/cassandra.go b/matcher/cassandra/cassandra.go index 704651f..1768c74 100644 --- a/matcher/cassandra/cassandra.go +++ b/matcher/cassandra/cassandra.go @@ -3,8 +3,8 @@ package cassandra import ( "bytes" "encoding/binary" - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" ) const ( diff --git a/matcher/dhcp/dhcp.go b/matcher/dhcp/dhcp.go index 77a8d41..d3cdbf3 100644 --- a/matcher/dhcp/dhcp.go +++ b/matcher/dhcp/dhcp.go @@ -6,7 +6,7 @@ package dhcp // "encoding/binary" // "fmt" // log "github.com/cihub/seelog" -// "git.loafle.net/overflow/overflow_probe/commons_go/matcher" +// "git.loafle.net/overflow/overflow_probe/matcher" // "net" // "time" //) diff --git a/matcher/dns/dns.go b/matcher/dns/dns.go index c456a24..5824732 100644 --- a/matcher/dns/dns.go +++ b/matcher/dns/dns.go @@ -3,8 +3,8 @@ package dns import ( "bytes" "encoding/binary" - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" ) type Dns_frame_header struct { diff --git a/matcher/ftp/ftp.go b/matcher/ftp/ftp.go index e3fad5f..431683d 100644 --- a/matcher/ftp/ftp.go +++ b/matcher/ftp/ftp.go @@ -1,8 +1,8 @@ package ftp import ( - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" log "github.com/cihub/seelog" ) diff --git a/matcher/http/http.go b/matcher/http/http.go index 484000f..ddfd020 100644 --- a/matcher/http/http.go +++ b/matcher/http/http.go @@ -1,8 +1,8 @@ package http import ( - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" "strings" ) diff --git a/matcher/imap/imap.go b/matcher/imap/imap.go index 0a68ecc..bf23ac7 100644 --- a/matcher/imap/imap.go +++ b/matcher/imap/imap.go @@ -1,8 +1,8 @@ package imap import ( - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" ) const ( diff --git a/matcher/ldap/ldap.go b/matcher/ldap/ldap.go index 6a3fc21..aa38b8e 100644 --- a/matcher/ldap/ldap.go +++ b/matcher/ldap/ldap.go @@ -3,8 +3,8 @@ package ldap import ( "bytes" "encoding/binary" - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" ) type LDAPMatcher struct { diff --git a/matcher/matcher.go b/matcher/matcher.go index e4c0f33..9989f23 100644 --- a/matcher/matcher.go +++ b/matcher/matcher.go @@ -12,9 +12,9 @@ import ( //"git.loafle.net/overflow/overflow_probe/collector/core/scan/service/matcher/mssql" //"git.loafle.net/overflow/overflow_probe/collector/core/scan/service/matcher/mysql" //"git.loafle.net/overflow/overflow_probe/collector/core/scan/service/matcher/netbios" - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/oracle" - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/oracle" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" //"git.loafle.net/overflow/overflow_probe/collector/core/scan/service/matcher/pop" //"git.loafle.net/overflow/overflow_probe/collector/core/scan/service/matcher/redis" //"git.loafle.net/overflow/overflow_probe/collector/core/scan/service/matcher/rmi" diff --git a/matcher/mongodb/mongodb.go b/matcher/mongodb/mongodb.go index b9b3daa..5b67136 100644 --- a/matcher/mongodb/mongodb.go +++ b/matcher/mongodb/mongodb.go @@ -5,8 +5,8 @@ import ( "encoding/binary" "math/rand" - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" ) const ( diff --git a/matcher/mssql/mssql.go b/matcher/mssql/mssql.go index f2cd0bc..d2b3c53 100644 --- a/matcher/mssql/mssql.go +++ b/matcher/mssql/mssql.go @@ -3,8 +3,8 @@ package mssql import ( "bytes" "encoding/binary" - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" ) const ( diff --git a/matcher/mysql/mysql.go b/matcher/mysql/mysql.go index 085a4fd..20d90e0 100644 --- a/matcher/mysql/mysql.go +++ b/matcher/mysql/mysql.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/binary" "fmt" - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" "strconv" "strings" ) diff --git a/matcher/netbios/netbios.go b/matcher/netbios/netbios.go index f9082f5..36a709b 100644 --- a/matcher/netbios/netbios.go +++ b/matcher/netbios/netbios.go @@ -3,8 +3,8 @@ package netbios import ( "bytes" "encoding/binary" - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" ) const ( diff --git a/matcher/oracle/oracle.go b/matcher/oracle/oracle.go index fb680cf..b73044c 100644 --- a/matcher/oracle/oracle.go +++ b/matcher/oracle/oracle.go @@ -3,8 +3,8 @@ package oracle import ( "bytes" "encoding/binary" - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" ) type OracleMatcher struct { diff --git a/matcher/pgsql/pgsql.go b/matcher/pgsql/pgsql.go index 35ae239..0a86d48 100644 --- a/matcher/pgsql/pgsql.go +++ b/matcher/pgsql/pgsql.go @@ -3,8 +3,8 @@ package pgsql import ( "bytes" "encoding/binary" - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" "strings" ) diff --git a/matcher/pgsql/pgsql_test.go b/matcher/pgsql/pgsql_test.go index f6556af..85824ec 100644 --- a/matcher/pgsql/pgsql_test.go +++ b/matcher/pgsql/pgsql_test.go @@ -2,7 +2,7 @@ package pgsql import ( "crypto/tls" - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" + "git.loafle.net/overflow/overflow_probe/matcher/packet" "net" "testing" ) diff --git a/matcher/pop/pop.go b/matcher/pop/pop.go index ecc1e44..dd19d68 100644 --- a/matcher/pop/pop.go +++ b/matcher/pop/pop.go @@ -1,8 +1,8 @@ package pop import ( - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" ) const ( diff --git a/matcher/redis/redis.go b/matcher/redis/redis.go index aecc3b9..606960d 100644 --- a/matcher/redis/redis.go +++ b/matcher/redis/redis.go @@ -1,8 +1,8 @@ package redis import ( - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" "strings" ) diff --git a/matcher/redis/redisProtected.go b/matcher/redis/redisProtected.go index 288a1c8..e8e775a 100644 --- a/matcher/redis/redisProtected.go +++ b/matcher/redis/redisProtected.go @@ -1,8 +1,8 @@ package redis import ( - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" ) const ( diff --git a/matcher/rmi/rmi.go b/matcher/rmi/rmi.go index 9b172c0..e06348e 100644 --- a/matcher/rmi/rmi.go +++ b/matcher/rmi/rmi.go @@ -3,8 +3,8 @@ package rmi import ( "bytes" "encoding/binary" - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" ) const ( diff --git a/matcher/smb/smb.go b/matcher/smb/smb.go index b10d5bc..b96ebf7 100644 --- a/matcher/smb/smb.go +++ b/matcher/smb/smb.go @@ -3,8 +3,8 @@ package smb import ( "bytes" "encoding/binary" - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" "strings" ) diff --git a/matcher/smtp/smtp.go b/matcher/smtp/smtp.go index cfee97d..5c7ab7d 100644 --- a/matcher/smtp/smtp.go +++ b/matcher/smtp/smtp.go @@ -1,8 +1,8 @@ package smtp import ( - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" "strings" ) diff --git a/matcher/snmp/snmpv2.go b/matcher/snmp/snmpv2.go index 7f0694f..ab4ba7a 100644 --- a/matcher/snmp/snmpv2.go +++ b/matcher/snmp/snmpv2.go @@ -3,8 +3,8 @@ package snmp import ( "bytes" "encoding/binary" - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" ) const ( diff --git a/matcher/snmp/snmpv3.go b/matcher/snmp/snmpv3.go index 66c9920..1d097b5 100644 --- a/matcher/snmp/snmpv3.go +++ b/matcher/snmp/snmpv3.go @@ -3,8 +3,8 @@ package snmp import ( "bytes" "encoding/binary" - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" ) type snmpv3GlobalData struct { diff --git a/matcher/ssh/ssh.go b/matcher/ssh/ssh.go index c1c6928..0027979 100644 --- a/matcher/ssh/ssh.go +++ b/matcher/ssh/ssh.go @@ -1,8 +1,8 @@ package ssh import ( - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" "strings" ) diff --git a/matcher/telnet/telnet.go b/matcher/telnet/telnet.go index f0d1776..c85e6a5 100644 --- a/matcher/telnet/telnet.go +++ b/matcher/telnet/telnet.go @@ -1,8 +1,8 @@ package telnet import ( - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" ) const ( diff --git a/matcher/wmi/wmi.go b/matcher/wmi/wmi.go index 0fc0940..1a63eb4 100644 --- a/matcher/wmi/wmi.go +++ b/matcher/wmi/wmi.go @@ -3,8 +3,8 @@ package wmi import ( "bytes" "encoding/binary" - "git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" - "git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" + "git.loafle.net/overflow/overflow_probe/matcher/packet" + "git.loafle.net/overflow/overflow_probe/model/scaninfo" ) const (