Warning no files (#73)

net-daemon · Apr 12, 2020 · b952c49 · b952c49
1 parent 9db7760
commit b952c49
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/.github/workflows/push_addon_dev.yml b/.github/workflows/push_addon_dev.yml
@@ -14,6 +14,6 @@ jobs:
       - uses: actions/checkout@master
       - name: "Set version number"
         run: |
-          sed -i '/        const string _version = /c\        const string _version = "dev build";' ${{github.workspace}}/src/DaemonRunner/DaemonRunner/Service/RunnerService.cs
+          sed -i '/        const string _version = /c\        const string _version = "dev build addon";' ${{github.workspace}}/src/DaemonRunner/DaemonRunner/Service/RunnerService.cs
       - name: Run deploy script using builder
         run: docker run --rm --privileged -v /var/run/docker.sock:/var/run/docker.sock -v ${{github.workspace}}/addon:/data homeassistant/amd64-builder -t /data --all --docker-user ${{ secrets.DOCKER_USERNAME }} --docker-password ${{ secrets.DOCKER_TOKEN }}
diff --git a/addon/rootfs/etc/services.d/NetDaemon/finish b/addon/rootfs/etc/services.d/NetDaemon/finish
@@ -1,4 +1,4 @@
-#!/usr/bin/execlineb -S0
+#!/usr/bin/execlineb -S1
 # ==============================================================================
 # NetDaemon Service
 # Take down the S6 supervision tree when NetDaemon fails

diff --git a/src/DaemonRunner/DaemonRunner/Service/App/CodeManager.cs b/src/DaemonRunner/DaemonRunner/Service/App/CodeManager.cs
@@ -181,6 +181,8 @@ public CodeManager(string codeFolder, ILogger logger)
             _loadedDaemonApps = new List<Type>(100);
             _instanciatedDaemonApps = new List<INetDaemonApp>(100);
 
+            _logger.LogInformation("Loading code and configuration from {path}", Path.GetFullPath(codeFolder));
+
             _yamlConfig = new YamlConfig(codeFolder);
 
             LoadLocalAssemblyApplicationsForDevelopment();
@@ -237,7 +239,13 @@ public async Task<IEnumerable<INetDaemonApp>> InstanceAndInitApplications(INetDa
             CompileScriptsInCodeFolder();
 
             var result = new List<INetDaemonApp>();
-            foreach (string file in _yamlConfig.GetAllConfigFilePaths())
+            var allConfigFilePaths = _yamlConfig.GetAllConfigFilePaths();
+
+            if (allConfigFilePaths.Count() == 0)
+            {
+                _logger.LogWarning("No yaml configuration files found, please add files to [netdaemonfolder]/apps");
+            }
+            foreach (string file in allConfigFilePaths)
             {
                 var yamlAppConfig = new YamlAppConfig(DaemonAppTypes, File.OpenText(file), _yamlConfig, file);
 
@@ -380,7 +388,15 @@ private void LoadAllCodeToLoadContext()
 
             using (var peStream = new MemoryStream())
             {
-                foreach (var csFile in GetCsFiles(_codeFolder))
+
+                var csFiles = GetCsFiles(_codeFolder);
+                if (csFiles.Count() == 0 && _loadedDaemonApps.Count() == 0)
+                {
+                    // Only log when not have locally built assemblies, typically in dev environment
+                    _logger.LogWarning("No .cs files files found, please add files to [netdaemonfolder]/apps");
+                }
+
+                foreach (var csFile in csFiles)
                 {
                     var sourceText = SourceText.From(File.ReadAllText(csFile));
                     var syntaxTree = SyntaxFactory.ParseSyntaxTree(sourceText, path: csFile);