Skip to content
Snippets Groups Projects
Commit 7b5da263 authored by Francesco Siddi's avatar Francesco Siddi
Browse files

Merge pull request #105 from joewestcott/master

Spelling
parents 0d82228f dcb45860
No related branches found
No related tags found
No related merge requests found
......@@ -70,7 +70,7 @@ $ cd manager; ./manage.py db upgrade
It's pretty simple. Move into each node folder and run - in four different terminals:
```
$ ./manage.py runserver # will start the node (dashoard, server, manager or worker according to the current folder)
$ ./manage.py runserver # will start the node (dashboard, server, manager or worker according to the current folder)
```
If you now visit `http://localhost:8888` with your web browser you should see the dashboard!
......
from application import db
class Setting(db.Model):
"""General manager settings. Currently cointaining the UUID of the manager.
"""General manager settings. Currently containing the UUID of the manager.
"""
id = db.Column(db.Integer, primary_key=True)
name = db.Column(db.String(128))
......
......@@ -9,7 +9,7 @@ from requests.exceptions import ConnectionError
class Manager(db.Model):
"""Model for the managers connected to the server. When a manager
connects, we veryfy that it has connected before, by checking its
connects, we verify that it has connected before, by checking its
ip_address and port fields (which are unique keys).
This will be updated to support a UUID, which will be stored in the
......
......@@ -6,8 +6,8 @@ from application.modules.settings.model import Setting
class Project(db.Model):
"""Production project folders
This is a temporary table to get quickly up and running with projects
suport in brender. In the future, project definitions could come from
This is a temporary table to get quickly up and running with project
support in brender. In the future, project definitions could come from
attract or it could be defined in another way.
"""
id = db.Column(db.Integer, primary_key=True)
......
......@@ -4,9 +4,9 @@ from urllib import urlopen
class Worker(db.Model):
"""Workers are the render nodes of the farm
The creation of a Worker in the database happens automatically a soon
The creation of a Worker in the database happens automatically as soon
as it connects to the server and its MAC address does not match any
of the one alreay present in the database.
of the one already present in the database.
"""
id = db.Column(db.Integer, primary_key=True)
mac_address = db.Column(db.Integer())
......
......@@ -33,7 +33,7 @@ Request
"settings", "string", "Settings for the task, which will be interpreted by the compiler"
"task_id", "integer", ""
"type", "string", "The compiler to use"
"parser", "string", "The parser to use againt such task"
"parser", "string", "The parser to use against such task"
Response
......@@ -154,7 +154,7 @@ Request
:widths: 20, 20, 30
"hostname", "string", "The hostname of the worker"
"sysmte", "string", "The OS of the worker"
"system", "string", "The OS of the worker"
......
......@@ -17,7 +17,7 @@ Main features
* Runs on Linux, OSX and Windows
* Automatic detection of clients
* Supports multiple Project
* Supports multiple Projects
* Stats on shot completions
* Priority system
......
......@@ -10,7 +10,7 @@ Installing flamenco
===================
Currently the only way to install blender is to get the files from GitHub,
either by dowloading the an archived release package, or by cloning the git
either by downloading an archived release package, or by cloning the git
repo:
git clone https://github.com/fsiddi/flamenco.git
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment