Permalink
Browse files

Another fix...

  • Loading branch information...
1 parent b849b1e commit 5a985a41f31677aa46866ce599b86e291447cac4 @scottpurdy scottpurdy committed May 13, 2016
View
@@ -18,7 +18,7 @@ Or, if you prefer pip:
You can see coverage across multiple projects as follows:
- py.test --cov nta.utils --cov htmengine --cov taurus taurus/tests/unit htmengine/tests/unit nta.utils/tests/unit
+ py.test --cov nta.utils --cov htmengine --cov taurus taurus_engine/tests/unit htmengine/tests/unit nta.utils/tests/unit
## Licenses
@@ -61,7 +61,7 @@ android {
// DynamoDB Server. Use 'http://10.0.2.2:8000' for local server or null for AWS
buildConfigField 'String', 'SERVER_URL', System.getProperty("SERVER_URL") != null ? "\"${System.getProperty("SERVER_URL")}\"" : 'null'
// Select DynamoDB tables to use. Use ".production" or your user name as suffix.
- // Should match server configuration in "$/products/taurus/conf/application.conf"
+ // Should match server configuration in "$/numenta-apps/taurus_engine/conf/application.conf"
buildConfigField 'String', 'TABLE_SUFFIX', '".staging"' //'".' + System.getProperty("user.name") + '"'
// AWS Region to connect
buildConfigField 'String', 'REGION', '"us-west-2"'
@@ -71,7 +71,7 @@ android {
release {
buildConfigField 'String', 'SERVER_URL', 'null'
// Use production DynamoDB tables
- // Should match server configuration in "$/products/taurus/conf/application.conf"
+ // Should match server configuration in "$/numenta-apps/taurus_engine/conf/application.conf"
buildConfigField 'String', 'TABLE_SUFFIX', '".production"'
// AWS Region to connect
buildConfigField 'String', 'REGION', '"us-west-2"'
@@ -86,7 +86,7 @@ android {
staging.initWith(buildTypes.qa)
staging {
// Use staging DynamoDB tables instead of production
- // Should match server configuration in "$/products/taurus/conf/application.conf"
+ // Should match server configuration in "$/numenta-apps/taurus_engine/conf/application.conf"
buildConfigField 'String', 'TABLE_SUFFIX', '".staging"'
versionNameSuffix '-' + defaultConfig.versionCode + '-' + gitCommitSHA + '-staging';
}
@@ -162,7 +162,7 @@ static void batchWrite(AmazonDynamoDBClient awsClient, String table, Queue<PutRe
*
* Mimic metric item as defined in taurus dynamodb service.
* <p>
- * See "/products/taurus/taurus/runtime/dynamodb/definitions/metric_dynamodbdefinition.py"
+ * See "/numenta-apps/taurus_engine/taurus_engine/runtime/dynamodb/definitions/metric_dynamodbdefinition.py"
* </p>
* <code><pre>
* ...
@@ -225,7 +225,7 @@ static void populateMetricTable(AmazonDynamoDBClient awsClient) {
*
* Mimic metric data item as defined in taurus dynamodb service.
* <p>
- * See "/products/taurus/taurus/runtime/dynamodb/definitions/metric_data_dynamodbdefinition.py"
+ * See "/numenta-apps/taurus_engine/taurus_engine/runtime/dynamodb/definitions/metric_data_dynamodbdefinition.py"
* </p>
* <code><pre>
* ...
@@ -304,7 +304,7 @@ static void populateMetricDataTable(AmazonDynamoDBClient awsClient) {
*
* Mimic data item as defined in taurus dynamodb service.
* <p>
- * See "/products/taurus/taurus/runtime/dynamodb/definitions/instance_data_hourly_dynamodbdefinition.py"
+ * See "/numenta-apps/taurus_engine/taurus_engine/runtime/dynamodb/definitions/instance_data_hourly_dynamodbdefinition.py"
* </p>
* <code><pre>
* ...
@@ -438,7 +438,7 @@ static void populateInstanceDataTable(AmazonDynamoDBClient awsClient) {
*
* Mimic metric tweet as defined in taurus dynamodb service.
* <p>
- * See "/products/taurus/taurus/runtime/dynamodb/definitions/metric_tweets_dynamodbdefinition.py"
+ * See "/numenta-apps/taurus_engine/taurus_engine/runtime/dynamodb/definitions/metric_tweets_dynamodbdefinition.py"
* </p>
* <code><pre>
* ...
@@ -212,10 +212,10 @@ Taurus and Docker
A [Dockerfile](https://docs.docker.com/engine/reference/builder/) is included
to support a docker-based workflow. To build a docker image, run the following
command from the root of the `numenta-apps` repository (the parent directory
-of `taurus/`):
+of `taurus_engine/`):
```
-docker build -t taurus:latest -f taurus/Dockerfile .
+docker build -t taurus:latest -f taurus_engine/Dockerfile .
```
See `Dockerfile` for specific environment variable configuration directives.
@@ -37,7 +37,7 @@ set -o errexit
prog=supervisord
NUMENTA=/opt/numenta
-TAURUS_D="${NUMENTA}/products/taurus"
+TAURUS_D="${NUMENTA}/numenta-apps/taurus_engine"
SUPERVISORCTL_URL="http://127.0.0.1:9001"
if [ ! -z "${DEBUG}" ]; then
@@ -48,10 +48,10 @@ if [ ! -z "${DEBUG}" ]; then
fi
# Load taurus environment
-if [ -r "${TAURUS_D}/taurus/env.sh" ]; then
- source "${TAURUS_D}/taurus/env.sh"
+if [ -r "${TAURUS_D}/taurus_engine/env.sh" ]; then
+ source "${TAURUS_D}/taurus_engine/env.sh"
else
- logger -t supervisor "${TAURUS_D}/taurus/env.sh is missing"
+ logger -t supervisor "${TAURUS_D}/taurus_engine/env.sh is missing"
exit 1
fi
@@ -472,7 +472,7 @@ def _handleNonMetricTweetData(self, body):
:param str body: Incoming message payload as a JSON-encoded list of objects,
with each object per
- ``taurus/metric_collectors/twitterdirect/tweet_export_schema.json``
+ ``taurus_engine/metric_collectors/twitterdirect/tweet_export_schema.json``
"""
payload = json.loads(body)
g_log.info("Handling %d non-metric tweet item(s)", len(payload))
@@ -548,7 +548,7 @@ def messageHandler(self, message):
Non-metric tweets: Incoming message payload as a JSON-encoded list of
objects, with each object formatted per
- ``taurus/metric_collectors/twitterdirect/tweet_export_schema.json``
+ ``taurus_engine/metric_collectors/twitterdirect/tweet_export_schema.json``
"""
if message.methodInfo.routingKey == "taurus.data.non-metric.twitter":
self._handleNonMetricTweetData(message.body)
@@ -18,8 +18,8 @@ def loadSchema(schemaFile):
Will throw IOError if given an invalid path
:param schemaFile: "examplefilename.json", function will look in
- TAURUS_HOME/taurus/webservices/schemas/ for the file.
- :returns: Loaded json schema object from taurus/webservices/schemas
+ TAURUS_HOME/taurus_engine/webservices/schemas/ for the file.
+ :returns: Loaded json schema object from taurus_engine/webservices/schemas
"""
@@ -35,8 +35,8 @@ set -o pipefail
set -o errexit
prog="taurus.metric.collector"
-PRODUCTS_D=/opt/numenta/products
-TAURUS_COLLECTOR_D="${PRODUCTS_D}/taurus.metric.collector"
+PRODUCTS_D=/opt/numenta/numenta-apps
+TAURUS_COLLECTOR_D="${PRODUCTS_D}/taurus_metric_collectors"
SUPERVISORCTL_URL="http://127.0.0.1:8001"
if [ ! -z "${DEBUG}" ]; then
@@ -50,7 +50,7 @@ fi
if [ -r "${TAURUS_COLLECTOR_D}/env.sh" ]; then
source "${TAURUS_COLLECTOR_D}/env.sh"
else
- failmsg="ERROR: ${TAURUS_COLLECTOR_D}/taurus/env.sh is missing, exiting helper"
+ failmsg="ERROR: ${TAURUS_COLLECTOR_D}/taurus_engine/env.sh is missing, exiting helper"
echo "${failmsg}"
logger -t taurus-collector "${failmsg}"
exit 1
@@ -6,6 +6,6 @@ Windows Comma Separated CSV format.
Example commands after updating metrics.csv:
cd $PRODUCTS/taurus_metric_collectors
- python taurus/metric_collectors/gen_metrics_config.py \
- taurus/metric_collectors/metric_csv_archive/metrics.csv > \
+ python taurus_engine/metric_collectors/gen_metrics_config.py \
+ taurus_engine/metric_collectors/metric_csv_archive/metrics.csv > \
conf/metrics.json

0 comments on commit 5a985a4

Please sign in to comment.