diff --git a/cron.py b/cron.py
index 89e1960..587ada4 100755
--- a/cron.py
+++ b/cron.py
@@ -6,7 +6,6 @@ django.setup()
from django.utils import timezone
from django.db import transaction
from django.db.models import signals
-from django.utils.translation import ugettext_lazy as _
from abonapp.models import Abon, AbonTariff, abontariff_pre_delete, PeriodicPayForId, AbonLog
from agent import Transmitter, NasNetworkError, NasFailedResult
from mydefs import LogicError
@@ -22,15 +21,16 @@ def main():
# finishing expires services
with transaction.atomic():
for ex_srv in expired_services.only(*fields).values(*fields):
- AbonLog.objects.create(
+ log = AbonLog.objects.create(
abon_id=ex_srv['abon__id'],
amount=0,
author=None,
date=now,
- comment=_("Service '%(service_name)s' has expired") % {
+ comment=_("Срок действия услуги '%(service_name)s' истёк") % {
'service_name': ex_srv['tariff__title']
}
)
+ print(log)
expired_services.delete()
signals.pre_delete.connect(abontariff_pre_delete, sender=AbonTariff)
diff --git a/devapp/locale/ru/LC_MESSAGES/django.po b/devapp/locale/ru/LC_MESSAGES/django.po
index 6354cbc..5c75bb6 100644
--- a/devapp/locale/ru/LC_MESSAGES/django.po
+++ b/devapp/locale/ru/LC_MESSAGES/django.po
@@ -476,6 +476,9 @@ msgstr "Вышестоящее устройство не найдено"
msgid "Send notify when monitoring state changed"
msgstr "Отправлять уведомления при событиях мониторинга"
+msgid "Device with mac address %(mac)s does not exist"
+msgstr "Устройство мак адресом %(mac)s не найдено"
+
msgid "Device %(device_name)s is up"
msgstr "%(device_name)s в сети"
diff --git a/devapp/views.py b/devapp/views.py
index b38551f..76e1914 100644
--- a/devapp/views.py
+++ b/devapp/views.py
@@ -460,6 +460,8 @@ def fix_onu(request):
status = 0
text = ' %s' % _('Fixed')
break
+ text = ' %s' %\
+ (_('Device with mac address %(mac)s does not exist') % {'mac': mac})
else:
text = text + ' %s' % _('Parent device not found')
except Device.DoesNotExist:
diff --git a/djing/urls.py b/djing/urls.py
index 6e92ef3..6a823cf 100644
--- a/djing/urls.py
+++ b/djing/urls.py
@@ -1,5 +1,6 @@
from django.conf.urls import url, include
from django.conf import settings
+from django.contrib import admin
from .views import home
@@ -16,14 +17,16 @@ urlpatterns = [
url(r'^tasks/', include('taskapp.urls', namespace='taskapp')),
url(r'^client/', include('clientsideapp.urls', namespace='client_side')),
url(r'^msg/', include('msg_app.urls', namespace='msg_app')),
- url(r'^dialing/', include('dialing_app.urls', namespace='dialapp'))
+ url(r'^dialing/', include('dialing_app.urls', namespace='dialapp')),
+ url(r'^admin/', admin.site.urls)
+
]
if settings.DEBUG:
from django.conf.urls.static import static
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
- from django.contrib import admin
+ #from django.contrib import admin
- urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
- urlpatterns += staticfiles_urlpatterns()
- urlpatterns += [url(r'^admin/', admin.site.urls)]
+ #urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+ #urlpatterns += staticfiles_urlpatterns()
+ #urlpatterns += [url(r'^admin/', admin.site.urls)]
diff --git a/telebot.py b/telebot.py
index 82edc0a..0111c53 100755
--- a/telebot.py
+++ b/telebot.py
@@ -4,6 +4,7 @@ import os
from pid.decorator import pidfile
import django
from telepot import DelegatorBot
+from telepot.exception import BadHTTPResponse
from telepot.delegate import per_chat_id, create_open, pave_event_space
@@ -12,12 +13,16 @@ def main():
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "djing.settings")
django.setup()
from chatbot.telebot import token, DjingTelebot
- bot = DelegatorBot(token, [
- pave_event_space()(
- per_chat_id(), create_open, DjingTelebot, timeout=300
- ),
- ])
- bot.message_loop(run_forever='Listening ...')
+ while True:
+ try:
+ bot = DelegatorBot(token, [
+ pave_event_space()(
+ per_chat_id(), create_open, DjingTelebot, timeout=300
+ ),
+ ])
+ bot.message_loop(run_forever='Listening ...')
+ except BadHTTPResponse as e:
+ print(e)
if __name__ == '__main__':