Skip to content
This repository has been archived by the owner on Apr 8, 2019. It is now read-only.

Commit

Permalink
added ops views
Browse files Browse the repository at this point in the history
  • Loading branch information
tarekziade committed Feb 28, 2017
1 parent 3862fa7 commit 3967c57
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 2 deletions.
1 change: 1 addition & 0 deletions serviceweb/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import logging

logger = logging.getLogger('servicebook')
__version__ = "0.1"
15 changes: 15 additions & 0 deletions serviceweb/tests/test_hb.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
from serviceweb.tests.support import BaseTest
from serviceweb import __version__


class HBTest(BaseTest):
def test_version(self):
info = self.app.get('/__version__').json
self.assertEqual(info['version'], __version__)

def test_lbheartbeat(self):
self.app.get('/__lbheartbeat__', status=200)

def test_heartbeat(self):
resp = self.app.get('/__heartbeat__', status=200).json
self.assertTrue(resp['database'])
4 changes: 3 additions & 1 deletion serviceweb/views/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
from .frontend import frontend
from .groups import groups
from .edit import edit
from .heartbeat import heartbeat


blueprints = (users_bp, actions, projects, auth, frontend, groups, edit)
blueprints = (users_bp, actions, projects, auth, frontend, groups, edit,
heartbeat)
29 changes: 29 additions & 0 deletions serviceweb/views/heartbeat.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import subprocess
import json
from flask import Blueprint, render_template, jsonify, g
from serviceweb import __version__


heartbeat = Blueprint('heartbeat', __name__)


@heartbeat.route('/__version__')
def _version():
commit = subprocess.check_output(["git", "describe", "--always"])
resp = render_template('version.json', version=__version__,
commit=str(commit.strip(), 'utf8'))
data = json.loads(resp)
return jsonify(data)


@heartbeat.route('/__lbheartbeat__')
def _lbheartbeat():
return ''


@heartbeat.route('/__heartbeat__')
def _heartbeat():
results = {}
users = g.db.get_entries('user')
results['database'] = len(users) > 0
return jsonify(results)
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import sys
from setuptools import setup, find_packages
from serviceweb import __version__


with open('requirements.txt') as f:
Expand All @@ -9,7 +10,7 @@


setup(name='serviceweb',
version="0.1",
version=__version__,
packages=find_packages(),
description="Mozilla Service Book Web App",
include_package_data=True,
Expand Down

0 comments on commit 3967c57

Please sign in to comment.