lightningd/log: fixes plugin help

Signed-off-by: Nishant Bansal <[email protected]>

Author: NishantBansal2003

cli/lightning-cli.c

@@ -49,6 +49,10 @@ static size_t human_readable(const char *buffer, const jsmntok_t *t, char term)
 					i++;
 					continue;
 				}
+			} else if (buffer[i] == '|') {
+				fputc('\n', stdout);
+				i++;
+				continue;
 			}
 			fputc(buffer[i], stdout);
 		}
@@ -85,8 +89,8 @@ static size_t flat_json(const char *prefix,
 	switch (t->type) {
 	case JSMN_PRIMITIVE:
 	case JSMN_STRING:
-		printf("%s=%.*s\n",
-		       prefix, t->end - t->start, buffer + t->start);
+		printf("%s=", prefix);
+		human_readable(buffer, t, '\n');
 		return 1;
 	case JSMN_ARRAY:
 		n = 1;
@@ -197,8 +201,8 @@ static void human_help(char *buffer, const jsmntok_t *result)
 	for (i = 0; i < tal_count(help); i++) {
 		const jsmntok_t *command;
 		command = json_get_member(buffer, help[i], "command");
-		printf("%.*s\n\n",
-		       command->end - command->start, buffer + command->start);
+		human_readable(buffer, command, '\n');
+		printf("\n");
 	}
 	tal_free(help);
 

contrib/pyln-client/pyln/client/plugin.py

@@ -84,7 +84,9 @@ def get_usage(self):
                 args.append("[%s]" % arg)
 
         if self.description is not None:
-            args.append("\n%s" % self.description)
+            doc = inspect.getdoc(self.func)
+            doc = re.sub('\n+', ' | ', doc)
+            args.append(" | %s" % doc)
 
         return " ".join(args)
 
@@ -938,16 +940,6 @@ def _getmanifest(self, **kwargs) -> JSONType:
                               'after': method.after})
                 continue
 
-            doc = inspect.getdoc(method.func)
-            if not doc:
-                self.log(
-                    'RPC method \'{}\' does not have a docstring.'.format(
-                        method.name
-                    )
-                )
-                doc = "Undocumented RPC method from a plugin."
-            doc = re.sub('\n+', ' ', doc)
-
             # For compatibility with lightningd prior to 24.08, we must
             # provide a description.  Ignored by 24.08 onwards,
             description = method.description