Commit 149ba6535d8146f9bf3ea3a6bd90bdd800139edf
1 parent
d96e2484
Exists in
dev
bugfix les chevrons...
Showing
2 changed files
with
1 additions
and
30 deletions
Show diff stats
README.md
src/agent/Agent.py
| ... | ... | @@ -78,10 +78,6 @@ from threading import Thread |
| 78 | 78 | import threading, multiprocessing |
| 79 | 79 | import time |
| 80 | 80 | import utils.Logger as L |
| 81 | -<<<<<<< HEAD | |
| 82 | -import random | |
| 83 | -======= | |
| 84 | ->>>>>>> 1d32122be4d1f56e208e7497498671de131dc8ce | |
| 85 | 81 | import socket |
| 86 | 82 | #import ctypes |
| 87 | 83 | #import copy |
| ... | ... | @@ -337,13 +333,8 @@ class Agent: |
| 337 | 333 | _computer_description = '' |
| 338 | 334 | _path_data = '../../config' |
| 339 | 335 | |
| 340 | -<<<<<<< HEAD | |
| 341 | - _iter_num = 1 | |
| 342 | -======= | |
| 343 | 336 | _iter_num = None |
| 344 | 337 | |
| 345 | ->>>>>>> 1d32122be4d1f56e208e7497498671de131dc8ce | |
| 346 | - | |
| 347 | 338 | def __init__(self, name:str="Agent", config_filename:str=None, RUN_IN_THREAD=True): |
| 348 | 339 | self.name = name |
| 349 | 340 | self.SIMULATOR_COMMANDS = iter(self.SIMULATOR_COMMANDS_LIST) |
| ... | ... | @@ -708,11 +699,7 @@ class Agent: |
| 708 | 699 | TODO: |
| 709 | 700 | only si date fichier xml changée => en RAM, un objet Config avec méthodes d'accès, appelle le parser de AK (classe Config.py indépendante) |
| 710 | 701 | """ |
| 711 | -<<<<<<< HEAD | |
| 712 | - print("Loading the config file...") | |
| 713 | -======= | |
| 714 | 702 | self.printd("Loading the config file...") |
| 715 | ->>>>>>> 1d32122be4d1f56e208e7497498671de131dc8ce | |
| 716 | 703 | self.config.load() |
| 717 | 704 | if self.config.get_last_errno() != self.config.NO_ERROR: |
| 718 | 705 | raise Exception(f"error {str(self.config.get_last_errno())}: {str(self.config.get_last_errmsg())}") |
| ... | ... | @@ -730,11 +717,7 @@ class Agent: |
| 730 | 717 | if param['section']=="assembly" and param['key']=="alias": |
| 731 | 718 | assembled_aliases.append(param['value']) |
| 732 | 719 | #print(f"Unit {unit_alias} is the assembly of {assembled_aliases}") |
| 733 | -<<<<<<< HEAD | |
| 734 | - | |
| 735 | -======= | |
| 736 | 720 | |
| 737 | ->>>>>>> 1d32122be4d1f56e208e7497498671de131dc8ce | |
| 738 | 721 | print("--------- Components of the unit -----------") |
| 739 | 722 | print("Configuration file is {}".format(self.config.get_configfile())) |
| 740 | 723 | alias = self.config.get_aliases('unit')[0] |
| ... | ... | @@ -752,17 +735,6 @@ class Agent: |
| 752 | 735 | assembled_mount_aliases.append(alias) |
| 753 | 736 | elif unit_subtag=="channel": |
| 754 | 737 | assembled_channel_aliases.append(alias) |
| 755 | -<<<<<<< HEAD | |
| 756 | - | |
| 757 | - print("--------- Assembly of the unit -----------") | |
| 758 | - print(f"Assembled mount aliases: {assembled_mount_aliases}") | |
| 759 | - print(f"Assembled channel aliases: {assembled_channel_aliases}") | |
| 760 | - | |
| 761 | - # --- Get the home of the mount[0] | |
| 762 | - mount_alias = assembled_mount_aliases[0] | |
| 763 | - home = self.config.get_param(mount_alias,'MountPointing','home') | |
| 764 | - | |
| 765 | -======= | |
| 766 | 738 | |
| 767 | 739 | print("--------- Assembly of the unit -----------") |
| 768 | 740 | print(f"Assembled mount aliases: {assembled_mount_aliases}") |
| ... | ... | @@ -772,7 +744,6 @@ class Agent: |
| 772 | 744 | mount_alias = assembled_mount_aliases[0] |
| 773 | 745 | home = self.config.get_param(mount_alias,'MountPointing','home') |
| 774 | 746 | |
| 775 | ->>>>>>> 1d32122be4d1f56e208e7497498671de131dc8ce | |
| 776 | 747 | print("------------------------------------------") |
| 777 | 748 | hostname = socket.gethostname() |
| 778 | 749 | self._computer_alias = '' | ... | ... |