Skip to content

Commit a006a94

Browse files
committed
Update to latest changelog format (1.5.x) and change log level for relevant actions
1 parent f2a7fa7 commit a006a94

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

ipamdb.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func (i *IpamDB) Open(dsn string) *IpamDB {
4040
if err != nil {
4141
panic(err)
4242
}
43-
log.Debug("Connected to database")
43+
log.Info("Connected to database")
4444

4545
db.SetConnMaxIdleTime(time.Minute * 3)
4646
db.SetMaxOpenConns(10)
@@ -49,7 +49,7 @@ func (i *IpamDB) Open(dsn string) *IpamDB {
4949
}
5050

5151
var changelogHostnameFinder = regexp.MustCompile(`\[hostname\]. (.+)\r`)
52-
var changelogIPFinder = regexp.MustCompile(`\[ip_addr\]\. (.*?)\r`)
52+
var changelogIPFinder = regexp.MustCompile(`\[ip_addr\]. (.*?)\r`)
5353

5454
func (i *IpamDB) ProcessChangelogRecords(resumeFrom int, clrprocessor func(ChangelogRecord) bool) {
5555
i.db.QueryRow("SELECT MAX(cid) FROM changelog").Scan(&i.maxlogid)
@@ -64,7 +64,7 @@ func (i *IpamDB) ProcessChangelogRecords(resumeFrom int, clrprocessor func(Chang
6464
AND cid > ? AND cid <= ?
6565
AND cresult = 'success'
6666
AND ctype = 'ip_addr'
67-
AND cdiff LIKE '%\n[hostname]. %'
67+
AND ( cdiff LIKE '%\n[hostname]_ %' OR cdiff LIKE '[hostname]_ %' )
6868
`, resumeFrom, i.maxlogid)
6969
if err != nil {
7070
panic(err)

main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func main() {
4444
defer ipamdb.Close()
4545
for {
4646
ipamdb.ProcessChangelogRecords(state.MaxId, func(record ChangelogRecord) bool {
47-
log.Debugf(
47+
log.Infof(
4848
"changeid=%v action=%v object[type=%v id=%v] => hostname:%v ip:%v\n",
4949
record.cid,
5050
record.caction,

0 commit comments

Comments
 (0)