Code Review
/
modeling
/
etsicatalog.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix the Exception with e.message problem
[modeling/etsicatalog.git]
/
catalog
/
pub
/
Dmaap_lib
/
dmaap
/
publisher.py
diff --git
a/catalog/pub/Dmaap_lib/dmaap/publisher.py
b/catalog/pub/Dmaap_lib/dmaap/publisher.py
index
7ebbca0
..
3ffff54
100644
(file)
--- a/
catalog/pub/Dmaap_lib/dmaap/publisher.py
+++ b/
catalog/pub/Dmaap_lib/dmaap/publisher.py
@@
-21,8
+21,7
@@
import time
from hashlib import sha1
import requests
from hashlib import sha1
import requests
-from apscheduler.scheduler import Scheduler
-
+from apscheduler.schedulers.background import BackgroundScheduler
from catalog.pub.Dmaap_lib.pub.exceptions import DmaapClientException
logger = logging.getLogger(__name__)
from catalog.pub.Dmaap_lib.pub.exceptions import DmaapClientException
logger = logging.getLogger(__name__)
@@
-40,9
+39,10
@@
class BatchPublisherClient:
self.pending = []
self.closed = False
self.dont_send_until_ms = 0
self.pending = []
self.closed = False
self.dont_send_until_ms = 0
- self.scheduler =
Scheduler(standalone=False
)
+ self.scheduler =
BackgroundScheduler(
)
- @self.scheduler.interval_schedule(second=1)
+ # @self.scheduler.interval_schedule(second=1)
+ @self.scheduler.scheduled_job(second=1)
def crawl_job():
self.send_message(False)
def crawl_job():
self.send_message(False)
@@
-60,7
+60,7
@@
class BatchPublisherClient:
self.pending.append(message)
return len(self.pending)
except Exception as e:
self.pending.append(message)
return len(self.pending)
except Exception as e:
- raise DmaapClientException("append message failed: " +
e.message
)
+ raise DmaapClientException("append message failed: " +
str(e)
)
def send_message(self, force):
if force or self.should_send_now():
def send_message(self, force):
if force or self.should_send_now():
@@
-122,7
+122,7
@@
class BatchPublisherClient:
return True
except Exception as e:
return True
except Exception as e:
- logger.error(
e.message
)
+ logger.error(
str(e)
)
return False
def create_headers(self):
return False
def create_headers(self):
@@
-163,7
+163,7
@@
class BatchPublisherClient:
time.sleep(0.25)
return self.pending
except Exception as e:
time.sleep(0.25)
return self.pending
except Exception as e:
- raise DmaapClientException("send message failed: " +
e.message
)
+ raise DmaapClientException("send message failed: " +
str(e)
)
class Message:
class Message: