Stephen Birarda
|
17a210813b
|
repairs to subclasses of assignment
|
2013-09-17 15:20:34 -07:00 |
|
ZappoMan
|
2388cfc8e0
|
first cut at making VoxelServer class run with configuration or standalone
|
2013-09-17 14:33:31 -07:00 |
|
ZappoMan
|
4932c3266f
|
moving to Assignment payload style implementation
|
2013-09-17 13:22:09 -07:00 |
|
ZappoMan
|
ad4dea129c
|
Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments
|
2013-09-17 12:18:51 -07:00 |
|
ZappoMan
|
48a579ae49
|
first cut at domain server config support
|
2013-09-17 12:18:46 -07:00 |
|
Stephen Birarda
|
2cfa45e4f8
|
allow the assignment-client to specify the type of assignment it desires
|
2013-09-17 12:09:10 -07:00 |
|
Stephen Birarda
|
74a0b8a7b5
|
resolve conflicts on merge with upstream master
|
2013-09-17 11:50:30 -07:00 |
|
Stephen Birarda
|
76df707e31
|
add the ability to ask for multiple instances from JS page
|
2013-09-17 11:48:08 -07:00 |
|
Stephen Birarda
|
0e19d9a53a
|
add handling for number of instances to domain-server
|
2013-09-17 11:19:13 -07:00 |
|
Stephen Birarda
|
063896f92a
|
Merge pull request #941 from ZappoMan/voxel_server_assignments
Voxel Server as a Assignment Client task
|
2013-09-17 10:51:31 -07:00 |
|
Stephen Birarda
|
a45d64a214
|
add ability to send a voxel in JS via VoxelScriptingInterface
|
2013-09-17 10:49:51 -07:00 |
|
Stephen Birarda
|
a238fb959f
|
link platform appropriate dl libraries on UNIX for civetweb
|
2013-09-17 09:30:40 -07:00 |
|
Stephen Birarda
|
b2f7115aef
|
remove document root debug
|
2013-09-17 09:18:46 -07:00 |
|
Stephen Birarda
|
291d34d49f
|
lowercase civetweb library in domain-server so it isn't so loud
|
2013-09-17 09:16:10 -07:00 |
|
ZappoMan
|
100eda6960
|
allow voxel servers in standalone mode to work with new domain server and assignment client
|
2013-09-16 19:56:34 -07:00 |
|
ZappoMan
|
92fb393e14
|
allow standalone voxel-server to specify port and domain, add VoxelServerType to assignment-client
|
2013-09-16 19:34:07 -07:00 |
|
Stephen Birarda
|
d6e3a4f3ba
|
reference domain-server web files relative to executable dir
|
2013-09-16 12:56:36 -07:00 |
|
Stephen Birarda
|
67389589ef
|
replace mongoose webserver with MIT licensed civetweb
|
2013-09-16 12:47:38 -07:00 |
|
Stephen Birarda
|
83ed162d49
|
include jquery and remove javascript includes from net
|
2013-09-13 12:42:14 -07:00 |
|
Stephen Birarda
|
fef54728ca
|
fix path for javascript save
|
2013-09-13 12:12:20 -07:00 |
|
Stephen Birarda
|
c40e848220
|
move DS web to resources for deploys
|
2013-09-13 11:21:03 -07:00 |
|
Stephen Birarda
|
d089991237
|
add handling of Agent assignments to Assignment, DS, AC
|
2013-09-13 11:14:00 -07:00 |
|
Stephen Birarda
|
49b72370be
|
fix UUID getter to match the private variable
|
2013-09-12 17:08:06 -07:00 |
|
Stephen Birarda
|
f878b17798
|
fix DS reply to node on same box to remove check in AC
|
2013-09-12 17:03:05 -07:00 |
|
Stephen Birarda
|
2578516940
|
talk to AC on loopback when on same node
|
2013-09-12 16:47:06 -07:00 |
|
Stephen Birarda
|
0d69e1cce0
|
expand the same host comparison to check 127.0.0.1
|
2013-09-12 16:31:43 -07:00 |
|
Stephen Birarda
|
25cd800ab4
|
create a UUID with assignments, store JS for script
|
2013-09-12 16:18:53 -07:00 |
|
Stephen Birarda
|
3dd0b40776
|
Merge branch 'assignment' into domain-web-server
|
2013-09-11 14:49:28 -07:00 |
|
Stephen Birarda
|
4ebac574ac
|
fix deque include for domain-server
|
2013-09-11 14:48:51 -07:00 |
|
Stephen Birarda
|
36b2381d79
|
Merge branch 'assignment' into domain-web-server
|
2013-09-11 14:47:26 -07:00 |
|
Stephen Birarda
|
fb8d3e9cf6
|
add a more helpful message to the DS root index.html
|
2013-09-11 14:47:23 -07:00 |
|
Stephen Birarda
|
df4973db6b
|
Merge branch 'master' of github.com:worklist/hifi into domain-web-server
|
2013-09-11 14:44:35 -07:00 |
|
Stephen Birarda
|
dfede2b947
|
rename direction to command for assignment
|
2013-09-11 14:43:37 -07:00 |
|
Stephen Birarda
|
803d2975dc
|
fix queue include
|
2013-09-11 12:43:57 -07:00 |
|
Stephen Birarda
|
04a40be97a
|
remove an extra g
|
2013-09-11 12:29:07 -07:00 |
|
Stephen Birarda
|
e1005288cb
|
prefer that audio-mixer assignment is fulfilled locally
|
2013-09-11 12:25:59 -07:00 |
|
Stephen Birarda
|
ff6fd73187
|
have the domain-server use the new verbose logging message handler
|
2013-09-11 12:17:30 -07:00 |
|
Stephen Birarda
|
b7aa49cf97
|
have DS act as AS and hand assignments directly
|
2013-09-11 12:16:47 -07:00 |
|
Stephen Birarda
|
c71ef85538
|
remove web directory before copying, clean more of ace
|
2013-09-10 14:55:30 -07:00 |
|
Stephen Birarda
|
6256388171
|
remove unused parts of ace editor
|
2013-09-10 14:52:02 -07:00 |
|
Stephen Birarda
|
53e0afa63b
|
open up a JS editor at /assignment on DS webserver
|
2013-09-10 14:42:30 -07:00 |
|
Stephen Birarda
|
1781f1607e
|
add mongoose webserver to domain-server
|
2013-09-10 14:31:20 -07:00 |
|
Stephen Birarda
|
fa521a5dc9
|
handle case where AC is on same network as DS but not AS
|
2013-09-09 18:15:33 -07:00 |
|
Stephen Birarda
|
8077963bb1
|
add standardized logging and leverage forked assignment clients
|
2013-09-09 14:21:33 -07:00 |
|
Stephen Birarda
|
d1c602df07
|
remove an extra g
|
2013-09-09 10:10:16 -07:00 |
|
Stephen Birarda
|
64e3c19a8c
|
fix an incorrectly typed const
|
2013-09-09 10:07:31 -07:00 |
|
Stephen Birarda
|
2fd043b55c
|
code review comments
|
2013-09-09 10:02:30 -07:00 |
|
Stephen Birarda
|
4905032090
|
allow forking of multiple assignment-clients from the main target
|
2013-09-09 09:44:43 -07:00 |
|
Stephen Birarda
|
cbf8a2c202
|
use create time already being stored with assignment to decide on re-send
|
2013-09-06 16:03:54 -07:00 |
|
Stephen Birarda
|
8424c4e38b
|
make DS immediately request assignments instead of waiting one silent loop
|
2013-09-06 15:44:24 -07:00 |
|
Stephen Birarda
|
65ef778efd
|
allow passing of custom assignment-server to DS and AC
|
2013-09-06 15:31:21 -07:00 |
|
Stephen Birarda
|
3b78678a76
|
cleanup pool grabbing for DS and AC
|
2013-09-06 15:21:55 -07:00 |
|
Stephen Birarda
|
0262184c12
|
put back DS port numbers, remove magic IPv numbers
|
2013-09-06 11:29:04 -07:00 |
|
Stephen Birarda
|
21562abfb1
|
don't add a second instance of a solo node
|
2013-09-05 17:29:14 -07:00 |
|
Stephen Birarda
|
8c5937dc78
|
only ask for an audio/avatar mixer every 5 iterations
|
2013-09-05 16:58:46 -07:00 |
|
Stephen Birarda
|
b88c74c1a1
|
remove the mongoose webserver
|
2013-09-05 16:25:42 -07:00 |
|
Stephen Birarda
|
8dad031c9a
|
add mongoose for demo webserver for DS
|
2013-09-05 15:27:34 -07:00 |
|
Stephen Birarda
|
8b601cac0a
|
moved the AvatarMixer to a class the assignment-client can handle
|
2013-09-05 14:01:05 -07:00 |
|
Stephen Birarda
|
36c2f42b5c
|
correct copying of assignment pool across targets
|
2013-09-04 11:50:39 -07:00 |
|
Stephen Birarda
|
ebc7de3a90
|
add methods for packing and unpacking of Assignments
|
2013-09-04 11:37:11 -07:00 |
|
Stephen Birarda
|
9260bee653
|
add assignment pool passing to DS, cleanup in AS
|
2013-09-04 11:13:37 -07:00 |
|
Stephen Birarda
|
29e5eda358
|
add notion of pool and direction to Assignment class
|
2013-09-04 10:43:16 -07:00 |
|
Stephen Birarda
|
ef7e7ae4c5
|
store senderSocket with assignment to be passed to requestor
|
2013-08-22 12:08:49 -07:00 |
|
Stephen Birarda
|
f52c1c909b
|
send assignment from domain server for audio mixer if it isn't present
|
2013-08-22 11:38:57 -07:00 |
|
ZappoMan
|
55a025a0ed
|
removed debug
|
2013-08-19 11:16:22 -07:00 |
|
ZappoMan
|
e64664c0d1
|
first cut at JurisdictionSender and related changes
|
2013-08-19 11:05:29 -07:00 |
|
Stephen Birarda
|
2b31a3586e
|
comment changes for local vs. non-local
|
2013-08-01 12:01:48 -07:00 |
|
Stephen Birarda
|
2fde29e04a
|
use a 0 public address to designate server local to DS
|
2013-08-01 11:53:18 -07:00 |
|
Stephen Birarda
|
afe49bc756
|
switch calls to printLog to QDebug
|
2013-07-16 11:07:22 -07:00 |
|
Stephen Birarda
|
4eb25be14c
|
fix node ID return from domain server
|
2013-07-11 12:09:42 -07:00 |
|
Stephen Birarda
|
c80b5b6be4
|
parse the nodeType from the correct location in packet
|
2013-07-11 11:30:19 -07:00 |
|
Stephen Birarda
|
fcb8865d2e
|
resolve conflicts on merge with upstream master
|
2013-07-11 10:58:45 -07:00 |
|
Stephen Birarda
|
ca8f25955a
|
switch usec timestamps to uint64_t
|
2013-07-10 11:46:48 -07:00 |
|
Stephen Birarda
|
e3d9289f1f
|
refactor packet version handling and apply to DS
|
2013-07-08 13:44:01 -07:00 |
|
Stephen Birarda
|
5062ae8965
|
rename PACKET_HEADER to PACKET_TYPE, fix DS packet versioning
|
2013-07-08 11:37:39 -07:00 |
|
Stephen Birarda
|
047d5b5cab
|
add packet version handling for DS packets
|
2013-07-08 11:17:29 -07:00 |
|
Stephen Birarda
|
36c6912de8
|
your agents are now nodes
|
2013-07-03 10:35:09 -07:00 |
|
Stephen Birarda
|
a5bd8cf3cd
|
DS node count is a timer stat for now
|
2013-07-02 16:41:46 -07:00 |
|
Stephen Birarda
|
f7f321663a
|
DRY up multiple stat type sending
|
2013-07-02 14:42:31 -07:00 |
|
Stephen Birarda
|
08c1d54cf3
|
send count of alive nodes to logstash from DS
|
2013-07-02 12:18:16 -07:00 |
|
Stephen Birarda
|
ef8c48245e
|
remove a couple of unused variables in the domain-server
|
2013-07-02 10:05:28 -07:00 |
|
Stephen Birarda
|
350ebfb80f
|
clients not on EC2 box should be talked to at public address
|
2013-06-18 13:32:17 -07:00 |
|
Stephen Birarda
|
5e8e50e53b
|
the EC2 domain server should send to the Agent's local socket
|
2013-06-18 13:11:31 -07:00 |
|
Andrzej Kapolka
|
db729a04aa
|
Converted double timestamps to long long (64 bit integers), fixed bug with
updating agent timestamps.
|
2013-06-13 11:11:59 -07:00 |
|
Andrzej Kapolka
|
7570329867
|
This appears still to be broken, but you know what? We already have the agent
pointer; why not just get the ID from that?
|
2013-06-12 16:28:37 -07:00 |
|
Andrzej Kapolka
|
ccd61ee5a2
|
Found the problem we were having: the domain server was reporting back all
kinds of things as our ID.
|
2013-06-12 16:13:44 -07:00 |
|
Stephen Birarda
|
7fb42dcb8a
|
fix bug with sent and received agent interest packets
|
2013-06-10 13:48:34 -07:00 |
|
Stephen Birarda
|
ed79a9f72a
|
prepend the agent types of interest with the number that follow
|
2013-06-10 12:18:25 -07:00 |
|
Stephen Birarda
|
0585d6756d
|
if an agent doesn't send a list of types of interest assume it wants to hear about nobody
|
2013-06-07 15:34:30 -07:00 |
|
Stephen Birarda
|
1e05936aea
|
unthread DS check in, allow agents to tell DS who they want to hear about
|
2013-06-07 15:19:12 -07:00 |
|
Stephen Birarda
|
95971b8303
|
rename AGENT_TYPE_VOXEL and PACKET_HEADER_DOMAIN_RFD
|
2013-06-07 14:12:42 -07:00 |
|
Stephen Birarda
|
b7b39c2a6e
|
have addOrUpdateAgent return a pointer to the agent instead of a bool
|
2013-05-17 14:03:15 -07:00 |
|
Stephen Birarda
|
fc5e42cf8b
|
add threaded injection of audio via audio injector class
|
2013-05-15 16:10:59 -07:00 |
|
Stephen Birarda
|
48b57c92bd
|
refactor Agent member variables
|
2013-05-15 14:12:21 -07:00 |
|
Stephen Birarda
|
9658c40dd6
|
change lastAgentId member variable to _lastAgentID
|
2013-05-07 17:17:47 -07:00 |
|
Stephen Birarda
|
722205682e
|
expect domain server to append one's own ID to end of packet
|
2013-05-07 12:05:13 -07:00 |
|
Stephen Birarda
|
c3ae1136e1
|
fix warning on comparison in DS
|
2013-05-06 14:48:57 -07:00 |
|
Stephen Birarda
|
cfd4a4a44a
|
smarter wake microstamp update for solo agents in DS
|
2013-05-06 14:46:01 -07:00 |
|
Stephen Birarda
|
9f320568e1
|
have the DS ignore packets it receives with incorrect headers
|
2013-05-06 13:49:06 -07:00 |
|
Stephen Birarda
|
f9edfd3b83
|
don't incorrectly push the broadcast packet pointer
|
2013-05-06 13:43:21 -07:00 |
|
Stephen Birarda
|
969bf7645a
|
remove an accidentally added g
|
2013-05-06 13:30:10 -07:00 |
|
Stephen Birarda
|
2a240f6474
|
type star squish in domain server
|
2013-05-06 13:14:58 -07:00 |
|
Stephen Birarda
|
e8babd6d1e
|
type star squish in domain server
|
2013-05-06 13:14:28 -07:00 |
|
Stephen Birarda
|
9e5f446ba2
|
update wake microstamp when receiving an RFD from an agent already in list
|
2013-05-06 12:51:43 -07:00 |
|
Stephen Birarda
|
beca9cac8d
|
update timestamp variables in Agent, use new packet headers for DS
|
2013-05-06 12:40:52 -07:00 |
|
Stephen Birarda
|
edc908b1cd
|
AgentList type squishes across project
|
2013-04-25 16:25:49 -07:00 |
|
Stephen Birarda
|
507f39a052
|
fix readability of agent dereference
|
2013-04-25 16:14:38 -07:00 |
|
Stephen Birarda
|
8deee63f74
|
remove line breaks in DS for loop
|
2013-04-25 15:56:26 -07:00 |
|
Stephen Birarda
|
625a963918
|
prefer -> notation to (*TYPE) for AgentList iterator
|
2013-04-25 15:49:25 -07:00 |
|
Stephen Birarda
|
88eca95020
|
fix domain-server to use new AgentList iterator
|
2013-04-25 15:24:36 -07:00 |
|
Stephen Birarda
|
7ae320d7e1
|
intial version of eve that says WALL-E every so often
|
2013-04-23 13:37:49 -07:00 |
|
Stephen Birarda
|
06b794563f
|
stop sending avatar agents to other avatars in DS packet
|
2013-04-22 17:40:27 -07:00 |
|
Stephen Birarda
|
daac10511e
|
output avatar mixer stats below the voxel stats
|
2013-04-18 16:58:08 -07:00 |
|
Stephen Birarda
|
4702e6ade0
|
remove the unecessary trailing slash when setting root dir
|
2013-04-15 14:59:48 -07:00 |
|
Stephen Birarda
|
cc2f35ca89
|
pass a ROOT_DIR to LinkHifiLibrary
|
2013-04-12 15:59:16 -07:00 |
|
Stephen Birarda
|
3e6b794f11
|
rename domain target to domain server, use SetupHifiProject
|
2013-04-12 13:12:56 -07:00 |
|