Cleaned up some logging and renamed PLM "log links" for consistency

[mstovenour]

Renamed PLM "show link table to log" as "log links" to be consistent with devices
Improved the amount of information supplied by existing logging messages.
Added "{devicename} completed sync links" message
Changed "PLM" NACK warning so it doesn't reference burned out bulbs which only apply to "device" NACKs.

[krkeegan]

I think you need to change the cmd_state on line 299 as well in order for this to work.

[mstovenour]

Good catch. This shows a flaw in my work flow. I omitted a change that I consider part of i2CS dev where I added a new command. I didn’t realize that I was omitting the renaming of that command as well.

From: krkeegan [mailto:notifications@github.com]
Sent: Monday, February 11, 2013 12:01 AM
To: hollie/misterhouse
Cc: Michael Stovenour
Subject: Re: [misterhouse] Cleaned up some logging and renamed PLM "log links" for consistency (#71)

In lib/Insteon.pm:

@@ -301,7 +301,7 @@ sub generate_voice_commands
$object_string .= "$object_name_v -> tie_event('$object_name->complete_linking_as_responder','complete linking as responder');\n\n";
$object_string .= "$object_name_v -> tie_event('$object_name->initiate_unlinking_as_controller','initiate unlinking');\n\n";
$object_string .= "$object_name_v -> tie_event('$object_name->cancel_linking','cancel linking');\n\n";

•       $object_string .= "$object_name_v -> tie_event('$object_name->log_alllink_table','show link table to log');\n\n";
  

•       $object_string .= "$object_name_v -> tie_event('$object_name->log_alllink_table','log links');\n\n";
  

I think you need to change the cmd_state on line 299 as well in order for this to work.

—
Reply to this email directly or view it on GitHub https://github.com/hollie/misterhouse/pull/71/files#r2957530 ..

https://github.com/notifications/beacon/Nvoh7bM6g31WX2NN_lw41aw6CQu8FlPOA0Yz7ZizF67PUMyIBvwKheDfowXkGvVK.gif

[krkeegan]

Hollie, I could use some help with this one. For whatever reason, possibly because it is two commits, I cannot merge it automatically.

[hollie]

Hi Kevin,

I'll get back to you tonight on this.

[hollie]

Hi,

I went ahead and tried to manually merge to see what causes the automatic merging to fail. Apparently, this pull request causes a conflict.

To reproduce:

nessie:misterhouse lieven$ git remote add mstovenour git://github.com/mstovenour/misterhouse.git
nessie:misterhouse lieven$ git fetch mstovenour
nessie:misterhouse lieven$ git merge mstovenour/fix_logging_cleanup
Auto-merging lib/Insteon_PLM.pm
Auto-merging lib/Insteon/BaseInsteon.pm
CONFLICT (content): Merge conflict in lib/Insteon/BaseInsteon.pm
Automatic merge failed; fix conflicts and then commit the result.

The conflict as around line 1513. I think it is because the pull request was not originating from a completely up-to-date BaseInsteon.pm file.

If somebody with Insteon testing capabilities can reproduce the steps above, fix the conflict, test and commit then the pull request can be closed.