Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • develop
  • feature/arch_support
  • feature/global_refactoring
  • master
  • v1.0.0
5 results

Target

Select target project
  • exact/Rosetta
1 result
Select Git revision
  • develop
  • feature/arch_support
  • feature/global_refactoring
  • master
  • v1.0.0
5 results
Show changes
Commits on Source (2)
...@@ -259,7 +259,10 @@ logger.info('Reporting for task uuid: "{}"'.format(task_uuid)) ...@@ -259,7 +259,10 @@ logger.info('Reporting for task uuid: "{}"'.format(task_uuid))
# Get IP # Get IP
ip = socket.gethostbyname(hostname) ip = socket.gethostbyname(hostname)
if ip == '127.0.1.1': if ip == '127.0.1.1':
ip = socket.gethostbyname(hostname+'.local') try:
ip = socket.gethostbyname(hostname+'.local')
except:
pass
logger.info(' - ip: "{}"'.format(ip)) logger.info(' - ip: "{}"'.format(ip))
# Get port # Get port
...@@ -307,9 +310,12 @@ print(port) ...@@ -307,9 +310,12 @@ print(port)
elif action=='set_ip_port': elif action=='set_ip_port':
task_interface_ip = request.GET.get('ip', None) if task.computing.type == 'standalone':
if not task_interface_ip: _, task_interface_ip, _, _ = get_ssh_access_mode_credentials(task.computing, task.user)
return HttpResponse('IP not valid (got "{}")'.format(task_interface_ip)) else:
task_interface_ip = request.GET.get('ip', None)
if not task_interface_ip:
return HttpResponse('IP not valid (got "{}")'.format(task_interface_ip))
task_interface_port = request.GET.get('port', None) task_interface_port = request.GET.get('port', None)
if not task_interface_port: if not task_interface_port:
......