93 Commits

Author SHA1 Message Date
James Muscat
cc7a92770e Bump version number. 2015-04-23 18:04:10 +01:00
James Muscat
52e4f78ffb Display new stats on the status page. 2015-04-23 18:03:47 +01:00
James Muscat
976454c358 Extra stats: uptime and EDDN version. 2015-04-23 09:57:51 +01:00
James Muscat
13e5cb4360 Merge pull request #6 from AnthorNet/master
Default gateway settings now include a /test variant of v2 commodity schema.
2015-04-22 15:38:05 +01:00
AnthorNet
67163c8bed Add test to commodity schema v2 2015-04-22 15:36:04 +02:00
AnthorNet
2bcab6f658 Fix extra whitespace 2015-04-22 15:20:06 +02:00
James Muscat
0539895060 Merge pull request #5 from AnthorNet/examples
Examples
2015-04-16 10:07:19 +01:00
AnthorNet
5b2b2138a4 Moved Client.py to examples 2015-04-16 10:01:43 +02:00
AnthorNet
fd9e596552 Added examples JSON for both schemas 2015-04-16 09:50:57 +02:00
James Muscat
e36245c21d Minor indentation fix. 2015-04-15 18:08:41 +01:00
James Muscat
e3d37d30cb Merge pull request #4 from AnthorNet/master
Added minLength to prevent empty properties
2015-04-15 17:50:57 +01:00
James Muscat
088eabe3e0 Separate update timestamps for each set of data. 2015-04-15 17:49:58 +01:00
AnthorNet
3c91042e34 Revert "Add null option to levelType enum"
This reverts commit 6b7096f6f7df092ea3a075e8e0b99094b1303834.
2015-04-15 18:41:14 +02:00
AnthorNet
baef8fa055 Merge branch 'jamesremuscat/master' 2015-04-15 18:32:14 +02:00
AnthorNet
6b7096f6f7 Add null option to levelType enum
Eg, when supply or demand is 0, level should be null.
2015-04-15 18:29:30 +02:00
James Muscat
c58f693105 Indentation fix. 2015-04-15 17:15:53 +01:00
James Muscat
c7ccf1b2c8 Initial values should be '-' not '0' since the latter implies bad
things.
2015-04-15 17:15:31 +01:00
James Muscat
bbdd6c7320 Wording fix. 2015-04-15 17:08:37 +01:00
James Muscat
4e57495348 Allow selection from all our gateways and relays. We currently only have
one of each, but it makes the point that we can deal with more.
2015-04-15 17:08:18 +01:00
James Muscat
cd4f1d69c6 Be consistent in function definition approach. 2015-04-15 16:59:56 +01:00
James Muscat
2691ed7a81 Colourise data if it's zero. 2015-04-15 16:09:07 +01:00
James Muscat
034c8fc4cc A simple status page using the stats output by Gateway and Relay. 2015-04-15 15:19:18 +01:00
James Muscat
1d270c112f Merge remote-tracking branch 'origin/master' 2015-04-15 15:02:37 +01:00
James Muscat
72cacba69d Bump version number. v0.2.1 2015-04-15 15:02:00 +01:00
James Muscat
3fc16cbb0a Set CORS header to allow status page to read these values. 2015-04-15 15:00:39 +01:00
AnthorNet
198031d740 Added minLength to prevent empty properties 2015-04-15 14:54:21 +02:00
James Muscat
73ff535bb8 Merge pull request #3 from AnthorNet/master
- Refactoring of schema
2015-04-15 12:23:41 +01:00
AnthorNet
fa9f06b9c4 Revert Commodity name validation 2015-04-15 12:18:58 +02:00
AnthorNet
fd496a0e29 Update commoditiesName description
- Update commoditiesName description.
- Some refactoring
2015-04-15 10:08:11 +02:00
AnthorNet
bf7e64e97a Refactoring and Validation
- Removed useless "additionalProperties"
- Ensure validation of commodities name
- Refactored formating for readability
2015-04-15 09:54:08 +02:00
James Muscat
beb003ba2e We have a dependency on argparse now. 2015-04-15 00:44:18 +01:00
James Muscat
5bd5b001d8 Draft v2.0 schema provided by AnthorNet. 2015-04-14 23:54:46 +01:00
James Muscat
e5af51d29b Some schema validators object to these IDs. They don't actually do
anything, so just get rid of them.
2015-04-14 23:42:51 +01:00
James Muscat
4c314a9b9b Keep track of how many messages fail gateway validation. 2015-04-14 17:06:26 +01:00
James Muscat
02f1ebc307 Unused import. 2015-04-14 16:39:09 +01:00
James Muscat
ddd81574ed Allow configuration of gateway HTTP port rather than hardcoding. 2015-04-14 16:38:56 +01:00
James Muscat
46292e3c30 Don't corrupt the commandline unless we're asked to.
The hacky approach caused problems with anything else trying to use
argparse (e.g. nosetests). This approach only tries to parse the
commandline if we need to e.g. within Relay/Gateway's main() function.
2015-04-14 14:30:26 +01:00
James Muscat
43ff4cda3a Move version number out of init file to its own file (consistent with
other projects).
2015-04-14 13:58:33 +01:00
James Muscat
1f3de2474c First pass at getting test framework up and running. 2015-04-14 13:36:23 +01:00
James Muscat
ec3987ad17 Correctly figure out enough of Python's internals for this to work. 2015-04-14 01:03:07 +01:00
James Muscat
d71469c10f This is slightly horrid, but parse the commandline in Settings to
determine if we need to override our configuration.
2015-04-14 00:55:31 +01:00
James Muscat
f178fec08d Allow overriding settings with config file. 2015-04-14 00:37:11 +01:00
James Muscat
da426c1d89 Encapsulate settings as a class. Make a singleton available. 2015-04-14 00:30:22 +01:00
James Muscat
074f24bc52 Whoops, accidentally changed this. 2015-04-13 18:33:19 +01:00
James Muscat
7d7f977cea Rip out the old method of collecting stats in favour of the generic way. 2015-04-13 18:32:32 +01:00
James Muscat
384a4f40fe ...except that tally should require the lock. 2015-04-13 18:28:50 +01:00
James Muscat
4bab5e3606 Let the StatsCollector collect arbitrary stats. 2015-04-13 18:28:04 +01:00
James Muscat
bd0afbc0c8 Actually count the right numbers, in the right order, and limit range
properly.
2015-04-13 18:14:39 +01:00
James Muscat
7c146a14c4 Factor out common code into StatsCollector. 2015-04-13 18:04:33 +01:00
James Muscat
95e83333d7 Add a StatsCollector to the Relay too. 2015-04-13 18:00:24 +01:00