diff --git a/access_node/__main__.py b/access_node/__main__.py index a7919408701e8fe108583dcd287bfe87d9739d0a..1dfe50e34ce032d95e5989617477fa92d550fdc8 100644 --- a/access_node/__main__.py +++ b/access_node/__main__.py @@ -25,18 +25,18 @@ def ConnectToDatabase(postgres_username, postgres_password): def main(): # Wait for simulation nodes to post to database - time.sleep(5) - - # get simulation nodes - con = ConnectToDatabase('postgres', 'postgres') - cur = con.cursor() - # NEST - cur.execute("SELECT address FROM nest_simulation_node") - nodes.nest_simulation_nodes = [i[0] for i in cur.fetchall()] - # Arbor - cur.execute("SELECT address FROM nest_simulation_node") - nodes.arbor_simulation_nodes = [i[0] for i in cur.fetchall()] - con.close() + time.sleep(0.1) + + # # get simulation nodes + # con = ConnectToDatabase('postgres', 'postgres') + # cur = con.cursor() + # # NEST + # cur.execute("SELECT address FROM nest_simulation_node") + # nodes.nest_simulation_nodes = [i[0] for i in cur.fetchall()] + # # Arbor + # cur.execute("SELECT address FROM nest_simulation_node") + # nodes.arbor_simulation_nodes = [i[0] for i in cur.fetchall()] + # con.close() # run acces_node diff --git a/access_node/controllers/nest_controller.py b/access_node/controllers/nest_controller.py index e4d52ca51689e3d66b4554d6323bdecc2e02fd15..855e0b606af1123ac0c1664407c834643c71a2ba 100644 --- a/access_node/controllers/nest_controller.py +++ b/access_node/controllers/nest_controller.py @@ -234,8 +234,14 @@ def nest_get_simulation_time_info(): # noqa: E501 :rtype: SimulationTimeInfo """ + con = connect_to_database() + cur = con.cursor() + cur.execute("SELECT address FROM nest_simulation_node") + nodes.nest_simulation_nodes = [i[0] for i in cur.fetchall()] + con.close() + + current_time = float('inf') - print("Hello") for node in nodes.nest_simulation_nodes: response = requests.get( node+'/current_simulation_time').json() @@ -264,6 +270,13 @@ def nest_get_spikes(_from=None, to=None, gids=None, offset=None, limit=None): # :rtype: Spikes """ + + con = connect_to_database() + cur = con.cursor() + cur.execute("SELECT address FROM nest_simulation_node") + nodes.nest_simulation_nodes = [i[0] for i in cur.fetchall()] + con.close() + spikes = Spikes([], []) for node in nodes.nest_simulation_nodes: response = requests.get( @@ -307,6 +320,12 @@ def nest_get_spikes_by_population(population_id, _from=None, to=None, offset=Non :rtype: Spikes """ + con = connect_to_database() + cur = con.cursor() + cur.execute("SELECT address FROM nest_simulation_node") + nodes.nest_simulation_nodes = [i[0] for i in cur.fetchall()] + con.close() + spikes = Spikes([], []) for node in nodes.nest_simulation_nodes: response = requests.get(