diff --git a/pwnagotchi/mesh/peer.py b/pwnagotchi/mesh/peer.py index c82058ed..6415752c 100644 --- a/pwnagotchi/mesh/peer.py +++ b/pwnagotchi/mesh/peer.py @@ -53,20 +53,20 @@ class Peer(object): def first_encounter(self): return self.encounters == 1 - def days_since_first_met(self): - return (datetime.datetime.now() - self.first_met).days - def face(self): return self.adv.get('face', faces.FRIEND) def name(self): - return self.adv.get('name') + return self.adv.get('name', '???') def identity(self): - return self.adv.get('identity') + return self.adv.get('identity', '???') + + def full_name(self): + return "%s@%s" % (self.name(), self.identity()) def version(self): - return self.adv.get('version') + return self.adv.get('version', '1.0.0a') def pwnd_run(self): return int(self.adv.get('pwnd_run', 0)) diff --git a/pwnagotchi/mesh/utils.py b/pwnagotchi/mesh/utils.py index 7b5c92d1..a3c9bdad 100644 --- a/pwnagotchi/mesh/utils.py +++ b/pwnagotchi/mesh/utils.py @@ -57,10 +57,12 @@ class AsyncAdvertiser(object): return sum(peer.encounters for _, peer in self._peers.items()) def _on_new_peer(self, peer): + logging.info("new peer %s detected (%d encounters)" % (peer.full_name(), peer.encounters)) self._view.on_new_peer(peer) plugins.on('peer_detected', self, peer) def _on_lost_peer(self, peer): + logging.info("lost peer %s" % peer.full_name()) self._view.on_lost_peer(peer) plugins.on('peer_lost', self, peer) @@ -102,4 +104,4 @@ class AsyncAdvertiser(object): logging.warning("error while polling pwngrid-peer: %s" % e) logging.debug(e, exc_info=True) - time.sleep(1) + time.sleep(3)