YangWX/MQTTnet
1
0
Fork 0
mirror of https://github.com/dotnet/MQTTnet.git synced 2026-10-17 01:33:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Expose more properties of the connection validator context in MQTTnet.Server. Migrate return code to reason code.

Browse Source
This commit is contained in:
Christian Kratky
2019-06-14 20:38:07 +02:00
parent bd665c3d56
commit 0c7a5a992b
9 changed files with 73 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MQTTnet.Server/Scripting/PythonScriptHostService.cs
+4 -8
View File
@@ -17,7 +17,7 @@ namespace MQTTnet.Server.Scripting
{
private readonly IDictionary<string, object> _proxyObjects = new ExpandoObject();
private readonly List<PythonScriptInstance> _scriptInstances = new List<PythonScriptInstance>();
private readonly string _scriptsPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Scripts");
private readonly string _scriptsPath;
private readonly ScriptingSettingsModel _scriptingSettings;
private readonly ILogger<PythonScriptHostService> _logger;
private readonly ScriptEngine _scriptEngine;
@@ -29,6 +29,8 @@ namespace MQTTnet.Server.Scripting
_scriptEngine = IronPython.Hosting.Python.CreateEngine();
_scriptEngine.Runtime.IO.SetOutput(pythonIOStream, Encoding.UTF8);
_scriptsPath = PathHelper.ExpandPath(scriptingSettings.ScriptsPath);
}
public void Configure()
@@ -186,13 +188,7 @@ namespace MQTTnet.Server.Scripting
foreach (var path in _scriptingSettings.IncludePaths)
{
var effectivePath = path;
var uri = new Uri(effectivePath, UriKind.RelativeOrAbsolute);
if (!uri.IsAbsoluteUri)
{
effectivePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, effectivePath);
}
var effectivePath = PathHelper.ExpandPath(path);
if (Directory.Exists(effectivePath))
{