Merge pull request #9 from finaldie/0.8

Merge branch 0.8 into master
finaldie · Jan 2, 2019 · 0216c7d · 0216c7d
2 parents 14dc9dd + b4feca9
commit 0216c7d
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 179 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,5 @@ cscope.*
 # deployment directory
 run/**
 tests/run/**
+
+compile_commands.json
diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py
@@ -79,9 +79,9 @@ def PythonSysPath(**kwargs):
 '-I',
 '.',
 '-I',
-'./src/common/c/src',
+'./src/common-cpp/src',
 '-I',
-'./src/common/c/tests',
+'./src/common-cpp/tests',
 '-isystem',
 '/usr/bin/../lib/gcc/x86_64-linux-gnu/4.8/include',
 '-isystem',

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,6 @@
+* 2019-01-01 0.8.3
+   * Upgrade `skull` to 1.4.3
+   * Refine python style
 * 2019-01-01 0.8.2
    * Upgrade `skull` to 1.4.2
    * Refine code structure

diff --git a/deps/skull b/deps/skull
diff --git a/src/modules/response/module.py b/src/modules/response/module.py
@@ -105,8 +105,8 @@ def module_pack(txn, txndata):
         duration = (time.time() - sharedData.startTime) * 1000
         logger.info(
             'ModulePack',
-            'Peer: {}:{} {} ,Duration: {} ms ,filtered: {} ,Question: {} \
-            ,type: {}, {} Answers: {}'
+            'Peer: {}:{} {} ,Duration: {:.3f} ms ,filtered: {} ,Question: {} '
+            ',type: {}, {} Answers: {}'
             .format(peerName, peerPort, peerType, duration, nFiltered,
                     question, qtype, nAnswers, ips))
 

diff --git a/src/services/dns b/src/services/dns
diff --git a/src/services/ranking/.ycm_extra_conf.py b/src/services/ranking/.ycm_extra_conf.py