haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/fix_hyperv_error'

Browse Source
This commit is contained in:
Kenneth Skovhede
2016-12-01 23:26:43 +01:00
parent 1a2a53cc29 792a8bc834
commit 576d84ebdb
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Server/WebServer/RESTMethods/HyperV.cs
+4 -2
View File
@@ -29,6 +29,8 @@ namespace Duplicati.Server.WebServer.RESTMethods
// Early exit in case we are non-windows to prevent attempting to load Windows-only components
if (Library.Utility.Utility.IsClientWindows)
RealGET(key, info);
else
info.OutputOK(new string[0]);
}
// Make sure the JIT does not attempt to inline this call and thus load
@@ -40,7 +42,7 @@ namespace Duplicati.Server.WebServer.RESTMethods
if (!hypervUtility.IsHyperVInstalled)
{
info.OutputOK();
info.OutputOK(new string[0]);
return;
}
@@ -64,7 +66,7 @@ namespace Duplicati.Server.WebServer.RESTMethods
}
catch (Exception ex)
{
info.ReportClientError("Failed to enumerate Hyper-V virtual machines: " + ex.Message);
info.ReportServerError("Failed to enumerate Hyper-V virtual machines: " + ex.Message);
}
}
Duplicati/Server/WebServer/RESTMethods/MSSQL.cs
+4 -2
View File
@@ -29,6 +29,8 @@ namespace Duplicati.Server.WebServer.RESTMethods
// Early exit in case we are non-windows to prevent attempting to load Windows-only components
if (Library.Utility.Utility.IsClientWindows)
RealGET(key, info);
else
info.OutputOK(new string[0]);
}
// Make sure the JIT does not attempt to inline this call and thus load
@@ -40,7 +42,7 @@ namespace Duplicati.Server.WebServer.RESTMethods
if (!mssqlUtility.IsMSSQLInstalled)
{
info.OutputOK();
info.OutputOK(new string[0]);
return;
}
@@ -62,7 +64,7 @@ namespace Duplicati.Server.WebServer.RESTMethods
}
catch (Exception ex)
{
info.ReportClientError("Failed to enumerate Microsoft SQL Server databases: " + ex.Message);
info.ReportServerError("Failed to enumerate Microsoft SQL Server databases: " + ex.Message);
}
}